Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #34

Merged
merged 4 commits into from
Apr 3, 2018
Merged

Develop #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57725c8
removed empty line
mirko-pagliai Apr 3, 2018
c65c4eb
now it uses the `mirko-pagliai/php-tools` package. This also replaces
mirko-pagliai Apr 3, 2018
c51bc82
fixed for sniffer
mirko-pagliai Apr 3, 2018
f6c0529
fixed
mirko-pagliai Apr 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@
composer.lock
coverage/
vendor/

4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
37 changes: 0 additions & 37 deletions src/Core/global_functions.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/TestSuite/TestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/ThumbTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
69 changes: 0 additions & 69 deletions tests/TestCase/Core/GlobalFunctionsTest.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/TestCase/Utility/ThumbCreatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/View/Helper/ThumbHelperTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down