Skip to content
This repository has been archived by the owner on Feb 17, 2020. It is now read-only.

Commit

Permalink
Merge pull request #3 from miloshavlicek/master
Browse files Browse the repository at this point in the history
Solve of deprecated parts
  • Loading branch information
akadlec authored Mar 15, 2018
2 parents eb3ae75 + 3db3513 commit 64452a1
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 83 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
composer.lock
vendor
tests/temp

#IDE
.idea
nbproject
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ checks:
build:
environment:
php:
version: 5.6
version: 7.0.20

dependencies:
before:
Expand Down
2 changes: 1 addition & 1 deletion .travis.composer.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
$composer = json_decode($content, TRUE);

$composer['require']['nette/di'] = $version;
$composer['require']['nette/utils'] = $version;
$composer['require']['nette/utils'] = '2.5.1';

$content = json_encode($composer);
file_put_contents($file, $content);
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,22 @@ language: php

env:
- NETTE=default
- NETTE=~2.2.0
- NETTE=~2.4.0

php:
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2
- hhvm

matrix:
allow_failures:
- php: hhvm
- php: 7.0

before_script:
- php .travis.composer.php
- composer self-update
- composer install --no-interaction --prefer-source --dev
- composer install --no-interaction --prefer-source

script:
- vendor/bin/tester -s -p php -c ./tests/php.ini-unix tests
Expand Down
18 changes: 8 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,27 @@
},

"require": {
"php" : ">=5.5.0",
"php" : ">=7.0.0",

"nette/di" : "~2.2",
"nette/utils" : "~2.2",
"nette/di" : ">=2.4",
"nette/utils" : ">=2.5",

"league/flysystem" : "~1.0"
},

"require-dev": {
"nette/application" : "~2.2",
"nette/bootstrap" : "~2.2",
"nette/mail" : "~2.2",
"nette/safe-stream" : "~2.2",
"nette/robot-loader" : "~2.2",
"nette/application" : ">=2.4",
"nette/bootstrap" : ">=2.4",
"nette/mail" : ">=2.4",
"nette/safe-stream" : ">=2.3",
"nette/robot-loader" : ">=2.4",
"nette/tester" : "@dev",

"tracy/tracy" : "@dev",

"league/flysystem-cached-adapter" : "~1.0",
"league/flysystem-aws-s3-v3" : "~1.0",
"league/flysystem-azure" : "~1.0",
"league/flysystem-copy" : "~1.0",
"league/flysystem-dropbox" : "~1.0",
"league/flysystem-gridfs" : "~1.0",
"league/flysystem-rackspace" : "~1.0",
Expand All @@ -56,7 +55,6 @@
"league/flysystem-cached-adapter" : "Flysystem adapter decorator for metadata caching",
"league/flysystem-aws-s3-v3" : "Allows you to use Amazon S3 storage with AWS SDK v3",
"league/flysystem-azure" : "Allows you to use Microsoft Azure storage",
"league/flysystem-copy" : "Allows you to use Copy.com storage",
"league/flysystem-dropbox" : "Allows you to use Dropbox storage",
"league/flysystem-gridfs" : "Allows you to use GridFS adapter",
"league/flysystem-rackspace" : "Allows you to use Rackspace Cloud Files",
Expand Down
2 changes: 1 addition & 1 deletion src/IPub/Flysystem/DI/FlysystemExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private function loadServices(array $services, $type)
]);

} else {
throw new Exceptions\InvalidAdapterException(sprintf('The service "%s" is not defined in Flystystem configuration.', $serviceName));
throw new Exceptions\InvalidAdapterException(sprintf('The service "%s" is not defined in Flysystem configuration.', $serviceName));
}
}
}
Expand Down
12 changes: 0 additions & 12 deletions src/IPub/Flysystem/DI/adapters.neon
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,6 @@ awss3v3:
required : FALSE
default : NULL

copy:
class : League\Flysystem\Copy\CopyAdapter
factory : IPub\Flysystem\Factories\Adapters\CopyFactory::create
parameters:
client:
type : string
required : TRUE
prefix:
type : string
required : FALSE
default : NULL

dropbox:
class : League\Flysystem\Dropbox\DropboxAdapter
factory : IPub\Flysystem\Factories\Adapters\DropboxFactory::create
Expand Down
52 changes: 0 additions & 52 deletions src/IPub/Flysystem/Factories/Adapters/CopyFactory.php

This file was deleted.

4 changes: 3 additions & 1 deletion src/IPub/Flysystem/Loaders/NeonFileLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
*
* @author Adam Kadlec <adam.kadlec@fastybird.com>
*/
class NeonFileLoader extends Nette\Object
class NeonFileLoader
{
use Nette\SmartObject;

/**
* @param $resource
*
Expand Down

0 comments on commit 64452a1

Please sign in to comment.