Update to 5.14

Joomla-Ukraine · Feb 16, 2023 · 1a60817 · 1a60817
1 parent 8f35311
commit 1a60817
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/build.xml b/build.xml
@@ -3,7 +3,7 @@
          basedir=".">
 
     <property name="VERSION"
-              value="5.13" />
+              value="5.14" />
     <property name="build"
               value="build" />
     <property name="temp"

diff --git a/composer.json b/composer.json
@@ -66,11 +66,12 @@
   },
   "prefer-stable": true,
   "suggest": {
-    "ext-gd": "PHP GD library",
     "ext-imagick": "PHP ImageMagick"
   },
   "require": {
     "php": ">=5.6",
-    "marc1706/fast-image-size": "1.*"
+    "marc1706/fast-image-size": "1.*",
+    "ext-json": "*",
+    "ext-gd": "PHP GD library"
   }
 }
diff --git a/script.php b/script.php
@@ -69,7 +69,7 @@ public function unlinkRecursive($dir, $deleteRootToo)
 			return;
 		}
 
-		while(false !== ($obj = readdir($dh)))
+		while(($obj = readdir($dh)) !== false)
 		{
 			if($obj === '.' || $obj === '..')
 			{

diff --git a/src/Image.php b/src/Image.php
@@ -280,7 +280,7 @@ private function createThumb($url, $img_cache, $target, array $attr = [])
 		}
 
 		$imagemagick_path = '';
-		if(0 === stripos(PHP_OS, 'WIN'))
+		if(stripos(PHP_OS, 'WIN') === 0)
 		{
 			$imagemagick_path = 'C:/ImageMagick/convert.exe';
 		}
@@ -444,7 +444,7 @@ private function youtube($id)
 	 */
 	private function vimeo($id)
 	{
-		$vimeo = json_decode(file_get_contents('https://vimeo.com/api/v2/video/' . $id . '.json'), false);
+		$vimeo = json_decode(file_get_contents('https://vimeo.com/api/v2/video/' . $id . '.json'));
 
 		if(!empty($vimeo))
 		{
-Original file line number
+Diff line change
@@ Expand Up / @@ -69,7 +69,7 @@ public function unlinkRecursive($dir, $deleteRootToo) @@
     			return;
     		}
-    		while(false !== ($obj = readdir($dh)))
+    		while(($obj = readdir($dh)) !== false)
     		{
     			if($obj === '.' || $obj === '..')
     			{
@@ Expand Down @@