Merge pull request #34 from mirko-pagliai/develop

Develop
mirko-pagliai · Apr 3, 2018 · 07b198b · 07b198b
2 parents b0cdf8a + f6c0529
commit 07b198b
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 118 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,3 @@
 composer.lock
 coverage/
 vendor/
-
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,9 @@
     `tests/bootstrap.php` file, using the `THUMBER_DRIVER` environment variable.
     By default, Imagick is used;
 * full support for Windows, added tests for Appveyor;
-* added `Thumber\TestSuite\TestCase::assertThumbUrl()` method.
+* added `Thumber\TestSuite\TestCase::assertThumbUrl()` method;
+* now it uses the `mirko-pagliai/php-tools` package. This also replaces
+    `mirko-pagliai/reflection`.
 
 ## 1.3 branch
 # 1.3.1

diff --git a/composer.json b/composer.json
@@ -11,20 +11,17 @@
     "require": {
         "php": ">=5.5.9",
         "cakephp/cakephp": ">=3.4 <4.0",
-        "intervention/image": "^2.4"
+        "intervention/image": "^2.4",
+        "mirko-pagliai/php-tools": "^1.0"
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^3.0",
-        "mirko-pagliai/reflection": "^1.0",
         "phpunit/phpunit": "^5.7|^6.0"
     },
     "autoload": {
         "psr-4": {
             "Thumber\\": "src"
-        },
-        "files": [
-            "src/Core/global_functions.php"
-        ]
+        }
     },
     "autoload-dev": {
         "psr-4": {

diff --git a/src/Core/global_functions.php b/src/Core/global_functions.php
diff --git a/src/TestSuite/TestCase.php b/src/TestSuite/TestCase.php
@@ -15,8 +15,8 @@
 use Cake\Core\Configure;
 use Cake\Filesystem\Folder;
 use Cake\TestSuite\TestCase as CakeTestCase;
-use Reflection\ReflectionTrait;
 use Thumber\ThumbTrait;
+use Tools\ReflectionTrait;
 
 /**
  * Thumber TestCase class

diff --git a/src/ThumbTrait.php b/src/ThumbTrait.php
@@ -94,7 +94,7 @@ protected function getUrl($path, $full = true)
     protected function resolveFilePath($path)
     {
         //Returns, if it's a remote file
-        if (isUrl($path)) {
+        if (is_url($path)) {
             return $path;
         }
 

diff --git a/tests/TestCase/Core/GlobalFunctionsTest.php b/tests/TestCase/Core/GlobalFunctionsTest.php
diff --git a/tests/TestCase/Utility/ThumbCreatorTest.php b/tests/TestCase/Utility/ThumbCreatorTest.php
@@ -15,9 +15,9 @@
 use Cake\Core\Plugin;
 use Intervention\Image\Exception\NotReadableException;
 use Intervention\Image\ImageManager;
-use Reflection\ReflectionTrait;
 use Thumber\TestSuite\TestCase;
 use Thumber\Utility\ThumbCreator;
+use Tools\ReflectionTrait;
 
 /**
  * ThumbCreatorTest class

diff --git a/tests/TestCase/View/Helper/ThumbHelperTest.php b/tests/TestCase/View/Helper/ThumbHelperTest.php
@@ -13,10 +13,10 @@
 namespace Thumber\Test\TestCase\View\Helper;
 
 use Cake\View\View;
-use Reflection\ReflectionTrait;
 use Thumber\TestSuite\TestCase;
 use Thumber\ThumbTrait;
 use Thumber\View\Helper\ThumbHelper;
+use Tools\ReflectionTrait;
 
 /**
  * ThumbHelperTest class