diff --git a/PHPCI/Plugin/Util/Factory.php b/PHPCI/Plugin/Util/Factory.php index 30c68340..62a64c78 100644 --- a/PHPCI/Plugin/Util/Factory.php +++ b/PHPCI/Plugin/Util/Factory.php @@ -2,6 +2,8 @@ namespace PHPCI\Plugin\Util; +use Pimple\Container; + /** * Plugin Factory - Loads Plugins and passes required dependencies. * @package PHPCI\Plugin\Util @@ -15,19 +17,19 @@ class Factory private $currentPluginOptions; /** - * @var \Pimple + * @var Container */ private $container; /** - * @param \Pimple $container + * @param Container $container */ - public function __construct(\Pimple $container = null) + public function __construct(Container $container = null) { if ($container) { $this->container = $container; } else { - $this->container = new \Pimple(); + $this->container = new Container(); } $self = $this; diff --git a/composer.json b/composer.json index 3de523e5..8e64798c 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "symfony/console": "~2.1", "psr/log": "~1.0", "monolog/monolog": "~1.6", - "pimple/pimple": "~1.1", + "pimple/pimple": "~3.0", "robmorgan/phinx": "~0.4", "sensiolabs/ansi-to-html": "~1.1", "jakub-onderka/php-parallel-lint": "0.8.*" diff --git a/composer.lock b/composer.lock index 21e42d42..497bd77a 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "0be92d5565a805ffe462c6061ed1dcf4", + "hash": "e12b5e931e334892180b1d963c3b3226", "packages": [ { "name": "block8/b8framework", @@ -216,16 +216,16 @@ }, { "name": "pimple/pimple", - "version": "v1.1.1", + "version": "v3.0.0", "source": { "type": "git", - "url": "https://github.com/fabpot/Pimple.git", - "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d" + "url": "https://github.com/silexphp/Pimple.git", + "reference": "876bf0899d01feacd2a2e83f04641e51350099ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Pimple/zipball/2019c145fe393923f3441b23f29bbdfaa5c58c4d", - "reference": "2019c145fe393923f3441b23f29bbdfaa5c58c4d", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/876bf0899d01feacd2a2e83f04641e51350099ef", + "reference": "876bf0899d01feacd2a2e83f04641e51350099ef", "shasum": "" }, "require": { @@ -234,12 +234,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { "psr-0": { - "Pimple": "lib/" + "Pimple": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -249,9 +249,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" } ], "description": "Pimple is a simple Dependency Injection Container for PHP 5.3", @@ -260,7 +258,7 @@ "container", "dependency injection" ], - "time": "2013-11-22 08:30:29" + "time": "2014-07-24 09:48:15" }, { "name": "psr/log",