Use psr4 and use pimple 2.1

flint · May 6, 2014 · 1d0dea5 · 1d0dea5
1 parent 2c45053
commit 1d0dea5
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "license" : "MIT",
 
     "autoload" : {
-        "psr-0" : { "Tacker\\" : "src" }
+        "psr-4" : { "Tacker\\" : "src" }
     },
 
     "require" : {
@@ -13,8 +13,8 @@
     },
 
     "require-dev" : {
-        "pimple/pimple" : "~1.0",
-        "symfony/yaml" : "~2.3"
+        "pimple/pimple" : "2.1.x-dev",
+        "symfony/yaml" : "~2.4"
     },
 
     "extra" : {

diff --git a/src/Tacker/Configurator.php → src/Configurator.php b/src/Tacker/Configurator.php → src/Configurator.php
@@ -3,7 +3,7 @@
 namespace Tacker;
 
 use Symfony\Component\Config\Loader\LoaderInterface;
-use Pimple;
+use Pimple\Container;
 
 class Configurator
 {
@@ -14,7 +14,7 @@ public function __construct(LoaderInterface $loader)
         $this->loader = $loader;
     }
 
-    public function configure(Pimple $pimple, $resource)
+    public function configure(Container $pimple, $resource)
     {
         $parameters = $this->loader->load($resource);
 

diff --git a/src/Tacker/Loader/AbstractLoader.php → src/Loader/AbstractLoader.php b/src/Tacker/Loader/AbstractLoader.php → src/Loader/AbstractLoader.php
diff --git a/src/Tacker/Loader/CacheLoader.php → src/Loader/CacheLoader.php b/src/Tacker/Loader/CacheLoader.php → src/Loader/CacheLoader.php
diff --git a/src/Tacker/Loader/IniFileLoader.php → src/Loader/IniFileLoader.php b/src/Tacker/Loader/IniFileLoader.php → src/Loader/IniFileLoader.php
diff --git a/src/Tacker/Loader/JsonFileLoader.php → src/Loader/JsonFileLoader.php b/src/Tacker/Loader/JsonFileLoader.php → src/Loader/JsonFileLoader.php
diff --git a/src/Tacker/Loader/NormalizerLoader.php → src/Loader/NormalizerLoader.php b/src/Tacker/Loader/NormalizerLoader.php → src/Loader/NormalizerLoader.php
diff --git a/src/Tacker/Loader/PhpFileLoader.php → src/Loader/PhpFileLoader.php b/src/Tacker/Loader/PhpFileLoader.php → src/Loader/PhpFileLoader.php
diff --git a/src/Tacker/Loader/YamlFileLoader.php → src/Loader/YamlFileLoader.php b/src/Tacker/Loader/YamlFileLoader.php → src/Loader/YamlFileLoader.php
diff --git a/src/Tacker/Normalizer.php → src/Normalizer.php b/src/Tacker/Normalizer.php → src/Normalizer.php
diff --git a/src/Tacker/Normalizer/ChainNormalizer.php → src/Normalizer/ChainNormalizer.php b/src/Tacker/Normalizer/ChainNormalizer.php → src/Normalizer/ChainNormalizer.php
diff --git a/src/Tacker/Normalizer/EnvfileNormalizer.php → src/Normalizer/EnvfileNormalizer.php b/src/Tacker/Normalizer/EnvfileNormalizer.php → src/Normalizer/EnvfileNormalizer.php
diff --git a/...cker/Normalizer/EnvironmentNormalizer.php → src/Normalizer/EnvironmentNormalizer.php b/...cker/Normalizer/EnvironmentNormalizer.php → src/Normalizer/EnvironmentNormalizer.php
diff --git a/src/Tacker/Normalizer/PimpleNormalizer.php → src/Normalizer/PimpleNormalizer.php b/src/Tacker/Normalizer/PimpleNormalizer.php → src/Normalizer/PimpleNormalizer.php
@@ -2,6 +2,8 @@
 
 namespace Tacker\Normalizer;
 
+use Pimple\Container;
+
 /**
  * @package Tacker
  */
@@ -10,9 +12,9 @@ class PimpleNormalizer implements \Tacker\Normalizer
     protected $pimple;
 
     /**
-     * @param Pimple $pimple
+     * @param Container $pimple
      */
-    public function __construct(\Pimple $pimple)
+    public function __construct(Container $pimple)
     {
         $this->pimple = $pimple;
     }

diff --git a/src/Tacker/ResourceCollection.php → src/ResourceCollection.php b/src/Tacker/ResourceCollection.php → src/ResourceCollection.php