From b86fb86c38be5396e89941851800302cae62f791 Mon Sep 17 00:00:00 2001
From: Alexander Obuhovich <aik.bold@gmail.com>
Date: Wed, 11 Nov 2015 21:34:18 +0200
Subject: [PATCH] Remove dependency on Pimple

---
 composer.json                                 |  11 +-
 composer.lock                                 | 491 +++++++++---------
 library/PimpleCopy/Pimple/Container.php       | 287 ++++++++++
 .../Pimple/ServiceProviderInterface.php       |  51 ++
 library/aik099/PHPUnit/DIContainer.php        |   2 +-
 phpunit.xml.dist                              |   4 +
 .../PimpleCopy/Pimple/Fixtures/Invokable.php  |  41 ++
 .../Pimple/Fixtures/NonInvokable.php          |  37 ++
 .../Pimple/Fixtures/PimpleServiceProvider.php |  59 +++
 tests/PimpleCopy/Pimple/Fixtures/Service.php  |  38 ++
 .../PimpleServiceProviderInterfaceTest.php    |  78 +++
 tests/PimpleCopy/Pimple/PimpleTest.php        | 448 ++++++++++++++++
 12 files changed, 1292 insertions(+), 255 deletions(-)
 create mode 100644 library/PimpleCopy/Pimple/Container.php
 create mode 100644 library/PimpleCopy/Pimple/ServiceProviderInterface.php
 create mode 100644 tests/PimpleCopy/Pimple/Fixtures/Invokable.php
 create mode 100644 tests/PimpleCopy/Pimple/Fixtures/NonInvokable.php
 create mode 100644 tests/PimpleCopy/Pimple/Fixtures/PimpleServiceProvider.php
 create mode 100644 tests/PimpleCopy/Pimple/Fixtures/Service.php
 create mode 100644 tests/PimpleCopy/Pimple/PimpleServiceProviderInterfaceTest.php
 create mode 100644 tests/PimpleCopy/Pimple/PimpleTest.php

diff --git a/composer.json b/composer.json
index 7c06c1a..3c8572f 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,6 @@
 		"behat/mink": "~1.6@dev",
 		"behat/mink-selenium2-driver": "~1.2",
 		"symfony/event-dispatcher": "~2.4",
-		"pimple/pimple": "~2.0|~3.0",
 		"phpunit/phpunit": ">=3.7.8"
 	},
 
@@ -27,14 +26,16 @@
 	},
 
 	"autoload": {
-		"psr-0": {
-			"aik099\\": "./library/"
+		"psr-4": {
+			"aik099\\PHPUnit\\": "library/aik099/PHPUnit",
+			"PimpleCopy\\Pimple\\": "library/PimpleCopy/Pimple"
 		}
 	},
 
 	"autoload-dev": {
-		"psr-0": {
-			"tests\\aik099\\": "./"
+		"psr-4": {
+			"tests\\aik099\\PHPUnit\\": "tests/aik099/PHPUnit",
+			"tests\\PimpleCopy\\Pimple\\": "tests/PimpleCopy/Pimple"
 		}
 	},
 
diff --git a/composer.lock b/composer.lock
index 07c5da3..5209b18 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,10 +1,11 @@
 {
     "_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": "961c9cfcd51f5d93088d7f57ab5a788b",
+    "hash": "b23234ed88998eb19abbaeec4b37aabe",
+    "content-hash": "407e1068e107c20a1ea3dd0ad22e0d60",
     "packages": [
         {
             "name": "behat/mink",
@@ -12,17 +13,20 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/Mink.git",
-                "reference": "30014f0a15579176b7fca879cb461aad900f4db5"
+                "reference": "901254e402269e78476843614f728917925c8135"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/Mink/zipball/30014f0a15579176b7fca879cb461aad900f4db5",
-                "reference": "30014f0a15579176b7fca879cb461aad900f4db5",
+                "url": "https://api.github.com/repos/minkphp/Mink/zipball/901254e402269e78476843614f728917925c8135",
+                "reference": "901254e402269e78476843614f728917925c8135",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.1",
-                "symfony/css-selector": "~2.0"
+                "symfony/css-selector": "~2.1"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
             },
             "suggest": {
                 "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
@@ -59,36 +63,39 @@
                 "testing",
                 "web"
             ],
-            "time": "2015-02-21 12:27:56"
+            "time": "2015-10-05 13:40:44"
         },
         {
             "name": "behat/mink-selenium2-driver",
-            "version": "v1.2.0",
+            "version": "v1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/MinkSelenium2Driver.git",
-                "reference": "8018fee80bf6573f909ece3e0dfc07d0eb352210"
+                "reference": "bedbf1999c7ba1bc6921b30ee2eadf383e7ff5c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/8018fee80bf6573f909ece3e0dfc07d0eb352210",
-                "reference": "8018fee80bf6573f909ece3e0dfc07d0eb352210",
+                "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/bedbf1999c7ba1bc6921b30ee2eadf383e7ff5c9",
+                "reference": "bedbf1999c7ba1bc6921b30ee2eadf383e7ff5c9",
                 "shasum": ""
             },
             "require": {
-                "behat/mink": "~1.6@dev",
+                "behat/mink": "~1.7@dev",
                 "instaclick/php-webdriver": "~1.1",
                 "php": ">=5.3.1"
             },
+            "require-dev": {
+                "symfony/phpunit-bridge": "~2.7"
+            },
             "type": "mink-driver",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2.x-dev"
+                    "dev-master": "1.3.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Behat\\Mink\\Driver": "src/"
+                "psr-4": {
+                    "Behat\\Mink\\Driver\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -117,20 +124,20 @@
                 "testing",
                 "webdriver"
             ],
-            "time": "2014-09-29 13:12:12"
+            "time": "2015-09-21 21:02:54"
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.0.4",
+            "version": "1.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119"
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119",
-                "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
                 "shasum": ""
             },
             "require": {
@@ -141,7 +148,7 @@
                 "ext-pdo": "*",
                 "ext-phar": "*",
                 "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "2.0.*@ALPHA"
+                "squizlabs/php_codesniffer": "~2.0"
             },
             "type": "library",
             "extra": {
@@ -150,8 +157,8 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Doctrine\\Instantiator\\": "src"
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -171,20 +178,20 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2014-10-13 12:58:55"
+            "time": "2015-06-14 21:17:01"
         },
         {
             "name": "instaclick/php-webdriver",
-            "version": "1.4.1",
+            "version": "1.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/instaclick/php-webdriver.git",
-                "reference": "a57b2bcd9467e217134a2248b261b8b3a90ccea0"
+                "reference": "0c20707dcf30a32728fd6bdeeab996c887fdb2fb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/a57b2bcd9467e217134a2248b261b8b3a90ccea0",
-                "reference": "a57b2bcd9467e217134a2248b261b8b3a90ccea0",
+                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/0c20707dcf30a32728fd6bdeeab996c887fdb2fb",
+                "reference": "0c20707dcf30a32728fd6bdeeab996c887fdb2fb",
                 "shasum": ""
             },
             "require": {
@@ -229,7 +236,7 @@
                 "webdriver",
                 "webtest"
             ],
-            "time": "2014-05-12 21:03:05"
+            "time": "2015-06-15 20:19:33"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -282,21 +289,22 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.3.1",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9"
+                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/9ca52329bcdd1500de24427542577ebf3fc2f1c9",
-                "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7",
+                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "~1.0,>=1.0.2",
-                "phpdocumentor/reflection-docblock": "~2.0"
+                "doctrine/instantiator": "^1.0.2",
+                "phpdocumentor/reflection-docblock": "~2.0",
+                "sebastian/comparator": "~1.1"
             },
             "require-dev": {
                 "phpspec/phpspec": "~2.0"
@@ -304,7 +312,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2.x-dev"
+                    "dev-master": "1.4.x-dev"
                 }
             },
             "autoload": {
@@ -328,7 +336,7 @@
                 }
             ],
             "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "http://phpspec.org",
+            "homepage": "https://github.com/phpspec/prophecy",
             "keywords": [
                 "Double",
                 "Dummy",
@@ -337,20 +345,20 @@
                 "spy",
                 "stub"
             ],
-            "time": "2014-11-17 16:23:49"
+            "time": "2015-08-13 10:07:40"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "2.0.15",
+            "version": "2.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67"
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/34cc484af1ca149188d0d9e91412191e398e0b67",
-                "reference": "34cc484af1ca149188d0d9e91412191e398e0b67",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
                 "shasum": ""
             },
             "require": {
@@ -358,7 +366,7 @@
                 "phpunit/php-file-iterator": "~1.3",
                 "phpunit/php-text-template": "~1.2",
                 "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "~1.0",
+                "sebastian/environment": "^1.3.2",
                 "sebastian/version": "~1.0"
             },
             "require-dev": {
@@ -373,7 +381,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0.x-dev"
+                    "dev-master": "2.2.x-dev"
                 }
             },
             "autoload": {
@@ -399,35 +407,37 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-01-24 10:06:35"
+            "time": "2015-10-06 15:47:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.3.4",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
-                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
-                    "File/"
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
@@ -444,20 +454,20 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2013-10-10 15:34:57"
+            "time": "2015-06-21 13:08:43"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a"
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
-                "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
                 "shasum": ""
             },
             "require": {
@@ -466,20 +476,17 @@
             "type": "library",
             "autoload": {
                 "classmap": [
-                    "Text/"
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -488,20 +495,20 @@
             "keywords": [
                 "template"
             ],
-            "time": "2014-01-30 17:20:04"
+            "time": "2015-06-21 13:50:34"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "1.0.5",
+            "version": "1.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c"
+                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
-                "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
                 "shasum": ""
             },
             "require": {
@@ -510,13 +517,10 @@
             "type": "library",
             "autoload": {
                 "classmap": [
-                    "PHP/"
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
             "license": [
                 "BSD-3-Clause"
             ],
@@ -532,20 +536,20 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2013-08-02 07:42:54"
+            "time": "2015-06-21 08:01:12"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "1.4.0",
+            "version": "1.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74"
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/db32c18eba00b121c145575fcbcd4d4d24e6db74",
-                "reference": "db32c18eba00b121c145575fcbcd4d4d24e6db74",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
                 "shasum": ""
             },
             "require": {
@@ -581,20 +585,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2015-01-17 09:51:32"
+            "time": "2015-09-15 10:49:45"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "4.5.0",
+            "version": "4.8.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "5b578d3865a9128b9c209b011fda6539ec06e7a5"
+                "reference": "fa33d4ad96481b91df343d83e8c8aabed6b1dfd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5b578d3865a9128b9c209b011fda6539ec06e7a5",
-                "reference": "5b578d3865a9128b9c209b011fda6539ec06e7a5",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fa33d4ad96481b91df343d83e8c8aabed6b1dfd3",
+                "reference": "fa33d4ad96481b91df343d83e8c8aabed6b1dfd3",
                 "shasum": ""
             },
             "require": {
@@ -604,19 +608,19 @@
                 "ext-reflection": "*",
                 "ext-spl": "*",
                 "php": ">=5.3.3",
-                "phpspec/prophecy": "~1.3.1",
-                "phpunit/php-code-coverage": "~2.0",
-                "phpunit/php-file-iterator": "~1.3.2",
+                "phpspec/prophecy": "^1.3.1",
+                "phpunit/php-code-coverage": "~2.1",
+                "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "~1.0.2",
+                "phpunit/php-timer": ">=1.0.6",
                 "phpunit/phpunit-mock-objects": "~2.3",
                 "sebastian/comparator": "~1.1",
-                "sebastian/diff": "~1.1",
-                "sebastian/environment": "~1.2",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "~1.3",
                 "sebastian/exporter": "~1.2",
                 "sebastian/global-state": "~1.0",
                 "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.0"
+                "symfony/yaml": "~2.1|~3.0"
             },
             "suggest": {
                 "phpunit/php-invoker": "~1.1"
@@ -627,7 +631,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.5.x-dev"
+                    "dev-master": "4.8.x-dev"
                 }
             },
             "autoload": {
@@ -653,29 +657,30 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-02-05 15:51:19"
+            "time": "2015-11-11 11:32:49"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.0",
+            "version": "2.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "c63d2367247365f688544f0d500af90a11a44c65"
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/c63d2367247365f688544f0d500af90a11a44c65",
-                "reference": "c63d2367247365f688544f0d500af90a11a44c65",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "~1.0,>=1.0.1",
+                "doctrine/instantiator": "^1.0.2",
                 "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2"
+                "phpunit/php-text-template": "~1.2",
+                "sebastian/exporter": "~1.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.3"
+                "phpunit/phpunit": "~4.4"
             },
             "suggest": {
                 "ext-soap": "*"
@@ -708,66 +713,20 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2014-10-03 05:12:11"
-        },
-        {
-            "name": "pimple/pimple",
-            "version": "v3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/silexphp/Pimple.git",
-                "reference": "876bf0899d01feacd2a2e83f04641e51350099ef"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/876bf0899d01feacd2a2e83f04641e51350099ef",
-                "reference": "876bf0899d01feacd2a2e83f04641e51350099ef",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Pimple": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
-            "homepage": "http://pimple.sensiolabs.org",
-            "keywords": [
-                "container",
-                "dependency injection"
-            ],
-            "time": "2014-07-24 09:48:15"
+            "time": "2015-10-02 06:51:40"
         },
         {
             "name": "sebastian/comparator",
-            "version": "1.1.1",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e"
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e",
-                "reference": "1dd8869519a225f7f2b9eb663e225298fade819e",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
                 "shasum": ""
             },
             "require": {
@@ -781,7 +740,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -818,20 +777,20 @@
                 "compare",
                 "equality"
             ],
-            "time": "2015-01-29 16:28:08"
+            "time": "2015-07-26 15:48:44"
         },
         {
             "name": "sebastian/diff",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7"
+                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/5843509fed39dee4b356a306401e9dd1a931fec7",
-                "reference": "5843509fed39dee4b356a306401e9dd1a931fec7",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3",
+                "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3",
                 "shasum": ""
             },
             "require": {
@@ -843,7 +802,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2-dev"
+                    "dev-master": "1.3-dev"
                 }
             },
             "autoload": {
@@ -870,32 +829,32 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2014-08-15 10:29:00"
+            "time": "2015-02-22 15:13:53"
         },
         {
             "name": "sebastian/environment",
-            "version": "1.2.1",
+            "version": "1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7"
+                "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7",
-                "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44",
+                "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.3"
+                "phpunit/phpunit": "~4.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.2.x-dev"
+                    "dev-master": "1.3.x-dev"
                 }
             },
             "autoload": {
@@ -920,20 +879,20 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2014-10-25 08:00:45"
+            "time": "2015-08-03 06:14:51"
         },
         {
             "name": "sebastian/exporter",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "84839970d05254c73cde183a721c7af13aede943"
+                "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943",
-                "reference": "84839970d05254c73cde183a721c7af13aede943",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
+                "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
                 "shasum": ""
             },
             "require": {
@@ -986,20 +945,20 @@
                 "export",
                 "exporter"
             ],
-            "time": "2015-01-27 07:23:06"
+            "time": "2015-06-21 07:55:53"
         },
         {
             "name": "sebastian/global-state",
-            "version": "1.0.0",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01"
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
-                "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
                 "shasum": ""
             },
             "require": {
@@ -1037,20 +996,20 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2014-10-06 09:23:50"
+            "time": "2015-10-12 03:26:01"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "1.0.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "3989662bbb30a29d20d9faa04a846af79b276252"
+                "reference": "994d4a811bafe801fb06dccbee797863ba2792ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252",
-                "reference": "3989662bbb30a29d20d9faa04a846af79b276252",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba",
+                "reference": "994d4a811bafe801fb06dccbee797863ba2792ba",
                 "shasum": ""
             },
             "require": {
@@ -1090,20 +1049,20 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-01-24 09:48:32"
+            "time": "2015-06-21 08:04:50"
         },
         {
             "name": "sebastian/version",
-            "version": "1.0.4",
+            "version": "1.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b"
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/a77d9123f8e809db3fbdea15038c27a95da4058b",
-                "reference": "a77d9123f8e809db3fbdea15038c27a95da4058b",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
                 "shasum": ""
             },
             "type": "library",
@@ -1125,37 +1084,33 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2014-12-15 14:25:24"
+            "time": "2015-06-21 13:59:46"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v2.6.5",
-            "target-dir": "Symfony/Component/CssSelector",
+            "version": "v2.7.6",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/CssSelector.git",
-                "reference": "86cf0aa16065ffc4545374e9479dd7878bf1d90f"
+                "url": "https://github.com/symfony/css-selector.git",
+                "reference": "e1b865b26be4a56d22a8dee398375044a80c865b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/CssSelector/zipball/86cf0aa16065ffc4545374e9479dd7878bf1d90f",
-                "reference": "86cf0aa16065ffc4545374e9479dd7878bf1d90f",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/e1b865b26be4a56d22a8dee398375044a80c865b",
+                "reference": "e1b865b26be4a56d22a8dee398375044a80c865b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
+                "php": ">=5.3.9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\CssSelector\\": ""
                 }
             },
@@ -1164,10 +1119,6 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Jean-François Simon",
                     "email": "jeanfrancois.simon@sensiolabs.com"
@@ -1175,36 +1126,38 @@
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony CssSelector Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-02-24 11:52:21"
+            "homepage": "https://symfony.com",
+            "time": "2015-10-11 09:39:48"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.6.5",
-            "target-dir": "Symfony/Component/EventDispatcher",
+            "version": "v2.7.6",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "70f7c8478739ad21e3deef0d977b38c77f1fb284"
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/70f7c8478739ad21e3deef0d977b38c77f1fb284",
-                "reference": "70f7c8478739ad21e3deef0d977b38c77f1fb284",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87a5db5ea887763fa3a31a5471b512ff1596d9b8",
+                "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": ">=5.3.9"
             },
             "require-dev": {
                 "psr/log": "~1.0",
                 "symfony/config": "~2.0,>=2.0.5",
                 "symfony/dependency-injection": "~2.6",
                 "symfony/expression-language": "~2.6",
-                "symfony/phpunit-bridge": "~2.7",
                 "symfony/stopwatch": "~2.3"
             },
             "suggest": {
@@ -1214,11 +1167,11 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\EventDispatcher\\": ""
                 }
             },
@@ -1227,48 +1180,44 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony EventDispatcher Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-03-13 17:37:22"
+            "homepage": "https://symfony.com",
+            "time": "2015-10-11 09:39:48"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.6.5",
-            "target-dir": "Symfony/Component/Yaml",
+            "version": "v2.7.6",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/Yaml.git",
-                "reference": "0cd8e72071e46e15fc072270ae39ea1b66b10a9d"
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "eca9019c88fbe250164affd107bc8057771f3f4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/0cd8e72071e46e15fc072270ae39ea1b66b10a9d",
-                "reference": "0cd8e72071e46e15fc072270ae39ea1b66b10a9d",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d",
+                "reference": "eca9019c88fbe250164affd107bc8057771f3f4d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7"
+                "php": ">=5.3.9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.6-dev"
+                    "dev-master": "2.7-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
+                "psr-4": {
                     "Symfony\\Component\\Yaml\\": ""
                 }
             },
@@ -1277,18 +1226,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Yaml Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-03-12 10:28:44"
+            "homepage": "https://symfony.com",
+            "time": "2015-10-11 09:39:48"
         }
     ],
     "packages-dev": [
@@ -1298,12 +1247,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/aik099/CodingStandard.git",
-                "reference": "f01c2c5cd22381566aa3daf9083deea6d323637a"
+                "reference": "b36c9389bd8caaeb28fdc960ec9c1c3a5a7d759e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aik099/CodingStandard/zipball/f01c2c5cd22381566aa3daf9083deea6d323637a",
-                "reference": "f01c2c5cd22381566aa3daf9083deea6d323637a",
+                "url": "https://api.github.com/repos/aik099/CodingStandard/zipball/b36c9389bd8caaeb28fdc960ec9c1c3a5a7d759e",
+                "reference": "b36c9389bd8caaeb28fdc960ec9c1c3a5a7d759e",
                 "shasum": ""
             },
             "require-dev": {
@@ -1330,30 +1279,74 @@
                 "PHP_CodeSniffer",
                 "codesniffer"
             ],
-            "time": "2015-03-18 08:14:41"
+            "time": "2015-10-22 19:29:49"
+        },
+        {
+            "name": "hamcrest/hamcrest-php",
+            "version": "v1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hamcrest/hamcrest-php.git",
+                "reference": "b37020aa976fa52d3de9aa904aa2522dc518f79c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hamcrest/hamcrest-php/zipball/b37020aa976fa52d3de9aa904aa2522dc518f79c",
+                "reference": "b37020aa976fa52d3de9aa904aa2522dc518f79c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "replace": {
+                "cordoval/hamcrest-php": "*",
+                "davedevelopment/hamcrest-php": "*",
+                "kodova/hamcrest-php": "*"
+            },
+            "require-dev": {
+                "phpunit/php-file-iterator": "1.3.3",
+                "satooshi/php-coveralls": "dev-master"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "hamcrest"
+                ],
+                "files": [
+                    "hamcrest/Hamcrest.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD"
+            ],
+            "description": "This is the PHP port of Hamcrest Matchers",
+            "keywords": [
+                "test"
+            ],
+            "time": "2015-05-11 14:41:42"
         },
         {
             "name": "mockery/mockery",
-            "version": "0.9.3",
+            "version": "0.9.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/padraic/mockery.git",
-                "reference": "686f85fa5b3b079cc0157d7cd3e9adb97f0b41e1"
+                "reference": "70bba85e4aabc9449626651f48b9018ede04f86b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/padraic/mockery/zipball/686f85fa5b3b079cc0157d7cd3e9adb97f0b41e1",
-                "reference": "686f85fa5b3b079cc0157d7cd3e9adb97f0b41e1",
+                "url": "https://api.github.com/repos/padraic/mockery/zipball/70bba85e4aabc9449626651f48b9018ede04f86b",
+                "reference": "70bba85e4aabc9449626651f48b9018ede04f86b",
                 "shasum": ""
             },
             "require": {
+                "hamcrest/hamcrest-php": "~1.1",
                 "lib-pcre": ">=7.0",
                 "php": ">=5.3.2"
             },
             "require-dev": {
-                "hamcrest/hamcrest-php": "~1.1",
-                "phpunit/phpunit": "~4.0",
-                "satooshi/php-coveralls": "~0.7@dev"
+                "phpunit/phpunit": "~4.0"
             },
             "type": "library",
             "extra": {
@@ -1382,7 +1375,7 @@
                     "homepage": "http://davedevelopment.co.uk"
                 }
             ],
-            "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succint API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.",
+            "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.",
             "homepage": "http://github.com/padraic/mockery",
             "keywords": [
                 "BDD",
@@ -1396,7 +1389,7 @@
                 "test double",
                 "testing"
             ],
-            "time": "2014-12-22 10:06:19"
+            "time": "2015-04-02 19:54:00"
         }
     ],
     "aliases": [],
diff --git a/library/PimpleCopy/Pimple/Container.php b/library/PimpleCopy/Pimple/Container.php
new file mode 100644
index 0000000..417b39b
--- /dev/null
+++ b/library/PimpleCopy/Pimple/Container.php
@@ -0,0 +1,287 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace PimpleCopy\Pimple;
+
+
+/**
+ * Container main class.
+ *
+ * @author Fabien Potencier
+ */
+class Container implements \ArrayAccess
+{
+
+	private $values = array();
+
+	private $factories;
+
+	private $protected;
+
+	private $frozen = array();
+
+	private $raw = array();
+
+	private $keys = array();
+
+	/**
+	 * Instantiate the container.
+	 *
+	 * Objects and parameters can be passed as argument to the constructor.
+	 *
+	 * @param array $values The parameters or objects.
+	 */
+	public function __construct(array $values = array())
+	{
+		$this->factories = new \SplObjectStorage();
+		$this->protected = new \SplObjectStorage();
+
+		foreach ( $values as $key => $value ) {
+			$this->offsetSet($key, $value);
+		}
+	}
+
+	/**
+	 * Sets a parameter or an object.
+	 *
+	 * Objects must be defined as Closures.
+	 *
+	 * Allowing any PHP callable leads to difficult to debug problems
+	 * as function names (strings) are callable (creating a function with
+	 * the same name as an existing parameter would break your container).
+	 *
+	 * @param string $id	The unique identifier for the parameter or object.
+	 * @param mixed  $value The value of the parameter or a closure to define an object.
+	 *
+	 * @return void
+	 * @throws \RuntimeException Prevent override of a frozen service.
+	 */
+	public function offsetSet($id, $value)
+	{
+		if ( isset($this->frozen[$id]) ) {
+			throw new \RuntimeException(sprintf('Cannot override frozen service "%s".', $id));
+		}
+
+		$this->values[$id] = $value;
+		$this->keys[$id] = true;
+	}
+
+	/**
+	 * Gets a parameter or an object.
+	 *
+	 * @param string $id The unique identifier for the parameter or object.
+	 *
+	 * @return mixed The value of the parameter or an object
+	 * @throws \InvalidArgumentException If the identifier is not defined.
+	 */
+	public function offsetGet($id)
+	{
+		if ( !isset($this->keys[$id]) ) {
+			throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
+		}
+
+		if ( isset($this->raw[$id])
+			|| !is_object($this->values[$id])
+			|| isset($this->protected[$this->values[$id]])
+			|| !method_exists($this->values[$id], '__invoke')
+		) {
+			return $this->values[$id];
+		}
+
+		if ( isset($this->factories[$this->values[$id]]) ) {
+			return $this->values[$id]($this);
+		}
+
+		$raw = $this->values[$id];
+		$val = $this->values[$id] = $raw($this);
+		$this->raw[$id] = $raw;
+
+		$this->frozen[$id] = true;
+
+		return $val;
+	}
+
+	/**
+	 * Checks if a parameter or an object is set.
+	 *
+	 * @param string $id The unique identifier for the parameter or object.
+	 *
+	 * @return boolean
+	 */
+	public function offsetExists($id)
+	{
+		return isset($this->keys[$id]);
+	}
+
+	/**
+	 * Unsets a parameter or an object.
+	 *
+	 * @param string $id The unique identifier for the parameter or object.
+	 *
+	 * @return void
+	 */
+	public function offsetUnset($id)
+	{
+		if ( isset($this->keys[$id]) ) {
+			if ( is_object($this->values[$id]) ) {
+				unset($this->factories[$this->values[$id]], $this->protected[$this->values[$id]]);
+			}
+
+			unset($this->values[$id], $this->frozen[$id], $this->raw[$id], $this->keys[$id]);
+		}
+	}
+
+	/**
+	 * Marks a callable as being a factory service.
+	 *
+	 * @param callable $callable A service definition to be used as a factory.
+	 *
+	 * @return callable The passed callable
+	 * @throws \InvalidArgumentException Service definition has to be a closure of an invokable object.
+	 */
+	public function factory($callable)
+	{
+		if ( !method_exists($callable, '__invoke') ) {
+			throw new \InvalidArgumentException('Service definition is not a Closure or invokable object.');
+		}
+
+		$this->factories->attach($callable);
+
+		return $callable;
+	}
+
+	/**
+	 * Protects a callable from being interpreted as a service.
+	 *
+	 * This is useful when you want to store a callable as a parameter.
+	 *
+	 * @param callable $callable A callable to protect from being evaluated.
+	 *
+	 * @return callable The passed callable
+	 * @throws \InvalidArgumentException Service definition has to be a closure of an invokable object.
+	 */
+	public function protect($callable)
+	{
+		if ( !method_exists($callable, '__invoke') ) {
+			throw new \InvalidArgumentException('Callable is not a Closure or invokable object.');
+		}
+
+		$this->protected->attach($callable);
+
+		return $callable;
+	}
+
+	/**
+	 * Gets a parameter or the closure defining an object.
+	 *
+	 * @param string $id The unique identifier for the parameter or object.
+	 *
+	 * @return mixed The value of the parameter or the closure defining an object
+	 * @throws \InvalidArgumentException If the identifier is not defined.
+	 */
+	public function raw($id)
+	{
+		if ( !isset($this->keys[$id]) ) {
+			throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
+		}
+
+		if ( isset($this->raw[$id]) ) {
+			return $this->raw[$id];
+		}
+
+		return $this->values[$id];
+	}
+
+	/**
+	 * Extends an object definition.
+	 *
+	 * Useful when you want to extend an existing object definition,
+	 * without necessarily loading that object.
+	 *
+	 * @param string   $id	     The unique identifier for the object.
+	 * @param callable $callable A service definition to extend the original.
+	 *
+	 * @return callable The wrapped callable
+	 * @throws \InvalidArgumentException If the identifier is not defined or not a service definition.
+	 */
+	public function extend($id, $callable)
+	{
+		if ( !isset($this->keys[$id]) ) {
+			throw new \InvalidArgumentException(sprintf('Identifier "%s" is not defined.', $id));
+		}
+
+		if ( !is_object($this->values[$id]) || !method_exists($this->values[$id], '__invoke') ) {
+			throw new \InvalidArgumentException(sprintf('Identifier "%s" does not contain an object definition.', $id));
+		}
+
+		if ( !is_object($callable) || !method_exists($callable, '__invoke') ) {
+			throw new \InvalidArgumentException('Extension service definition is not a Closure or invokable object.');
+		}
+
+		$factory = $this->values[$id];
+
+		$extended = function ($c) use ($callable, $factory) {
+			return $callable($factory($c), $c);
+		};
+
+		if ( isset($this->factories[$factory]) ) {
+			$this->factories->detach($factory);
+			$this->factories->attach($extended);
+		}
+
+		return $this[$id] = $extended;
+	}
+
+	/**
+	 * Returns all defined value names.
+	 *
+	 * @return array An array of value names
+	 */
+	public function keys()
+	{
+		return array_keys($this->values);
+	}
+
+	/**
+	 * Registers a service provider.
+	 *
+	 * @param ServiceProviderInterface $provider A ServiceProviderInterface instance.
+	 * @param array					   $values   An array of values that customizes the provider.
+	 *
+	 * @return static
+	 */
+	public function register(ServiceProviderInterface $provider, array $values = array())
+	{
+		$provider->register($this);
+
+		foreach ( $values as $key => $value ) {
+			$this[$key] = $value;
+		}
+
+		return $this;
+	}
+
+}
diff --git a/library/PimpleCopy/Pimple/ServiceProviderInterface.php b/library/PimpleCopy/Pimple/ServiceProviderInterface.php
new file mode 100644
index 0000000..e1d1d71
--- /dev/null
+++ b/library/PimpleCopy/Pimple/ServiceProviderInterface.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace PimpleCopy\Pimple;
+
+
+/**
+ * Pimple service provider interface.
+ *
+ * @author Fabien Potencier
+ * @author Dominik Zogg
+ */
+interface ServiceProviderInterface
+{
+
+	/**
+	 * Registers services on the given container.
+	 *
+	 * This method should only be used to configure services and parameters.
+	 * It should not get services.
+	 *
+	 * @param Container $pimple A container instance.
+	 *
+	 * @return void
+	 */
+	public function register(Container $pimple);
+
+}
diff --git a/library/aik099/PHPUnit/DIContainer.php b/library/aik099/PHPUnit/DIContainer.php
index 9bd56ad..9624565 100644
--- a/library/aik099/PHPUnit/DIContainer.php
+++ b/library/aik099/PHPUnit/DIContainer.php
@@ -30,7 +30,7 @@
 use aik099\PHPUnit\TestSuite\BrowserTestSuite;
 use aik099\PHPUnit\TestSuite\RegularTestSuite;
 use aik099\PHPUnit\TestSuite\TestSuiteFactory;
-use Pimple\Container;
+use PimpleCopy\Pimple\Container;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
 class DIContainer extends Container implements IApplicationAware
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index fa6afdd..37498bb 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -11,6 +11,9 @@
 		<testsuite name="PHPUnit">
 			<directory>tests/aik099/PHPUnit</directory>
 		</testsuite>
+		<testsuite name="PimpleCopy">
+			<directory>tests/PimpleCopy/Pimple</directory>
+		</testsuite>
 	</testsuites>
 
 	<!--<logging>
@@ -36,6 +39,7 @@
 	<filter>
 		<whitelist>
 			<directory>library/aik099/PHPUnit</directory>
+			<directory>library/PimpleCopy/Pimple</directory>
 		</whitelist>
 	</filter>
 </phpunit>
diff --git a/tests/PimpleCopy/Pimple/Fixtures/Invokable.php b/tests/PimpleCopy/Pimple/Fixtures/Invokable.php
new file mode 100644
index 0000000..d5081b0
--- /dev/null
+++ b/tests/PimpleCopy/Pimple/Fixtures/Invokable.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace tests\PimpleCopy\Pimple\Fixtures;
+
+
+class Invokable
+{
+
+	public function __invoke($value = null)
+	{
+		$service = new Service();
+		$service->value = $value;
+
+		return $service;
+	}
+
+}
diff --git a/tests/PimpleCopy/Pimple/Fixtures/NonInvokable.php b/tests/PimpleCopy/Pimple/Fixtures/NonInvokable.php
new file mode 100644
index 0000000..4aefd06
--- /dev/null
+++ b/tests/PimpleCopy/Pimple/Fixtures/NonInvokable.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace tests\PimpleCopy\Pimple\Fixtures;
+
+
+class NonInvokable
+{
+
+	public function __call($a, $b)
+	{
+	}
+
+}
diff --git a/tests/PimpleCopy/Pimple/Fixtures/PimpleServiceProvider.php b/tests/PimpleCopy/Pimple/Fixtures/PimpleServiceProvider.php
new file mode 100644
index 0000000..83ea920
--- /dev/null
+++ b/tests/PimpleCopy/Pimple/Fixtures/PimpleServiceProvider.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace tests\PimpleCopy\Pimple\Fixtures;
+
+
+use PimpleCopy\Pimple\Container;
+use PimpleCopy\Pimple\ServiceProviderInterface;
+
+class PimpleServiceProvider implements ServiceProviderInterface
+{
+
+	/**
+	 * Registers services on the given container.
+	 *
+	 * This method should only be used to configure services and parameters.
+	 * It should not get services.
+	 *
+	 * @param Container $pimple An Container instance.
+	 *
+	 * @return void
+	 */
+	public function register(Container $pimple)
+	{
+		$pimple['param'] = 'value';
+
+		$pimple['service'] = function () {
+			return new Service();
+		};
+
+		$pimple['factory'] = $pimple->factory(function () {
+			return new Service();
+		});
+	}
+
+}
diff --git a/tests/PimpleCopy/Pimple/Fixtures/Service.php b/tests/PimpleCopy/Pimple/Fixtures/Service.php
new file mode 100644
index 0000000..347e809
--- /dev/null
+++ b/tests/PimpleCopy/Pimple/Fixtures/Service.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace tests\PimpleCopy\Pimple\Fixtures;
+
+
+/**
+ * @author  Igor Wiedler <igor@wiedler.ch>
+ */
+class Service
+{
+
+	public $value;
+
+}
diff --git a/tests/PimpleCopy/Pimple/PimpleServiceProviderInterfaceTest.php b/tests/PimpleCopy/Pimple/PimpleServiceProviderInterfaceTest.php
new file mode 100644
index 0000000..033e731
--- /dev/null
+++ b/tests/PimpleCopy/Pimple/PimpleServiceProviderInterfaceTest.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace tests\PimpleCopy\Pimple;
+
+
+use PimpleCopy\Pimple\Container;
+
+/**
+ * @author  Dominik Zogg <dominik.zogg@gmail.com>
+ */
+class PimpleServiceProviderInterfaceTest extends \PHPUnit_Framework_TestCase
+{
+	public function testProvider()
+	{
+		$pimple = new Container();
+
+		$pimple_service_provider = new Fixtures\PimpleServiceProvider();
+		$pimple_service_provider->register($pimple);
+
+		$this->assertEquals('value', $pimple['param']);
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $pimple['service']);
+
+		$service_one = $pimple['factory'];
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $service_one);
+
+		$service_two = $pimple['factory'];
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $service_two);
+
+		$this->assertNotSame($service_one, $service_two);
+	}
+
+	public function testProviderWithRegisterMethod()
+	{
+		$pimple = new Container();
+
+		$pimple->register(new Fixtures\PimpleServiceProvider(), array(
+			'anotherParameter' => 'anotherValue',
+		));
+
+		$this->assertEquals('value', $pimple['param']);
+		$this->assertEquals('anotherValue', $pimple['anotherParameter']);
+
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $pimple['service']);
+
+		$service_one = $pimple['factory'];
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $service_one);
+
+		$service_two = $pimple['factory'];
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $service_two);
+
+		$this->assertNotSame($service_one, $service_two);
+	}
+
+}
diff --git a/tests/PimpleCopy/Pimple/PimpleTest.php b/tests/PimpleCopy/Pimple/PimpleTest.php
new file mode 100644
index 0000000..d41342f
--- /dev/null
+++ b/tests/PimpleCopy/Pimple/PimpleTest.php
@@ -0,0 +1,448 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace tests\PimpleCopy\Pimple;
+
+use PimpleCopy\Pimple\Container;
+
+/**
+ * @author  Igor Wiedler <igor@wiedler.ch>
+ */
+class PimpleTest extends \PHPUnit_Framework_TestCase
+{
+	public function testWithString()
+	{
+		$pimple = new Container();
+		$pimple['param'] = 'value';
+
+		$this->assertEquals('value', $pimple['param']);
+	}
+
+	public function testWithClosure()
+	{
+		$pimple = new Container();
+		$pimple['service'] = function () {
+			return new Fixtures\Service();
+		};
+
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $pimple['service']);
+	}
+
+	public function testServicesShouldBeDifferent()
+	{
+		$pimple = new Container();
+		$pimple['service'] = $pimple->factory(function () {
+			return new Fixtures\Service();
+		});
+
+		$service_one = $pimple['service'];
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $service_one);
+
+		$service_two = $pimple['service'];
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $service_two);
+
+		$this->assertNotSame($service_one, $service_two);
+	}
+
+	public function testShouldPassContainerAsParameter()
+	{
+		$pimple = new Container();
+		$pimple['service'] = function () {
+			return new Fixtures\Service();
+		};
+		$pimple['container'] = function ($container) {
+			return $container;
+		};
+
+		$this->assertNotSame($pimple, $pimple['service']);
+		$this->assertSame($pimple, $pimple['container']);
+	}
+
+	public function testIsset()
+	{
+		$pimple = new Container();
+		$pimple['param'] = 'value';
+		$pimple['service'] = function () {
+			return new Fixtures\Service();
+		};
+
+		$pimple['null'] = null;
+
+		$this->assertTrue(isset($pimple['param']));
+		$this->assertTrue(isset($pimple['service']));
+		$this->assertTrue(isset($pimple['null']));
+		$this->assertFalse(isset($pimple['non_existent']));
+	}
+
+	public function testConstructorInjection()
+	{
+		$params = array('param' => 'value');
+		$pimple = new Container($params);
+
+		$this->assertSame($params['param'], $pimple['param']);
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 * @expectedExceptionMessage Identifier "foo" is not defined.
+	 */
+	public function testOffsetGetValidatesKeyIsPresent()
+	{
+		$pimple = new Container();
+		echo $pimple['foo'];
+	}
+
+	public function testOffsetGetHonorsNullValues()
+	{
+		$pimple = new Container();
+		$pimple['foo'] = null;
+		$this->assertNull($pimple['foo']);
+	}
+
+	public function testUnset()
+	{
+		$pimple = new Container();
+		$pimple['param'] = 'value';
+		$pimple['service'] = function () {
+			return new Fixtures\Service();
+		};
+
+		unset($pimple['param'], $pimple['service']);
+		$this->assertFalse(isset($pimple['param']));
+		$this->assertFalse(isset($pimple['service']));
+	}
+
+	/**
+	 * @dataProvider serviceDefinitionProvider
+	 */
+	public function testShare($service)
+	{
+		$pimple = new Container();
+		$pimple['shared_service'] = $service;
+
+		$service_one = $pimple['shared_service'];
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $service_one);
+
+		$service_two = $pimple['shared_service'];
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $service_two);
+
+		$this->assertSame($service_one, $service_two);
+	}
+
+	/**
+	 * @dataProvider serviceDefinitionProvider
+	 */
+	public function testProtect($service)
+	{
+		$pimple = new Container();
+		$pimple['protected'] = $pimple->protect($service);
+
+		$this->assertSame($service, $pimple['protected']);
+	}
+
+	public function testGlobalFunctionNameAsParameterValue()
+	{
+		$pimple = new Container();
+		$pimple['global_function'] = 'strlen';
+		$this->assertSame('strlen', $pimple['global_function']);
+	}
+
+	public function testRaw()
+	{
+		$pimple = new Container();
+		$pimple['service'] = $definition = $pimple->factory(function () {
+			return 'foo';
+		});
+		$this->assertSame($definition, $pimple->raw('service'));
+	}
+
+	public function testRawHonorsNullValues()
+	{
+		$pimple = new Container();
+		$pimple['foo'] = null;
+		$this->assertNull($pimple->raw('foo'));
+	}
+
+	public function testFluentRegister()
+	{
+		$pimple = new Container();
+		$this->assertSame($pimple, $pimple->register($this->getMock('PimpleCopy\Pimple\ServiceProviderInterface')));
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 * @expectedExceptionMessage Identifier "foo" is not defined.
+	 */
+	public function testRawValidatesKeyIsPresent()
+	{
+		$pimple = new Container();
+		$pimple->raw('foo');
+	}
+
+	/**
+	 * @dataProvider serviceDefinitionProvider
+	 */
+	public function testExtend($service)
+	{
+		$pimple = new Container();
+		$pimple['shared_service'] = function () {
+			return new Fixtures\Service();
+		};
+		$pimple['factory_service'] = $pimple->factory(function () {
+			return new Fixtures\Service();
+		});
+
+		$pimple->extend('shared_service', $service);
+		$service_one = $pimple['shared_service'];
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $service_one);
+		$service_two = $pimple['shared_service'];
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $service_two);
+		$this->assertSame($service_one, $service_two);
+		$this->assertSame($service_one->value, $service_two->value);
+
+		$pimple->extend('factory_service', $service);
+		$service_one = $pimple['factory_service'];
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $service_one);
+		$service_two = $pimple['factory_service'];
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $service_two);
+		$this->assertNotSame($service_one, $service_two);
+		$this->assertNotSame($service_one->value, $service_two->value);
+	}
+
+	public function testExtendDoesNotLeakWithFactories()
+	{
+		if ( extension_loaded('pimple') ) {
+			$this->markTestSkipped('Pimple extension does not support this test');
+		}
+
+		$pimple = new Container();
+
+		$pimple['foo'] = $pimple->factory(function () {
+			return;
+		});
+		$pimple['foo'] = $pimple->extend('foo', function ($foo, $pimple) {
+			return;
+		});
+		unset($pimple['foo']);
+
+		$p = new \ReflectionProperty($pimple, 'values');
+		$p->setAccessible(true);
+		$this->assertEmpty($p->getValue($pimple));
+
+		$p = new \ReflectionProperty($pimple, 'factories');
+		$p->setAccessible(true);
+		$this->assertCount(0, $p->getValue($pimple));
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 * @expectedExceptionMessage Identifier "foo" is not defined.
+	 */
+	public function testExtendValidatesKeyIsPresent()
+	{
+		$pimple = new Container();
+		$pimple->extend('foo', function () {});
+	}
+
+	public function testKeys()
+	{
+		$pimple = new Container();
+		$pimple['foo'] = 123;
+		$pimple['bar'] = 123;
+
+		$this->assertEquals(array('foo', 'bar'), $pimple->keys());
+	}
+
+	/** @test */
+	public function settingAnInvokableObjectShouldTreatItAsFactory()
+	{
+		$pimple = new Container();
+		$pimple['invokable'] = new Fixtures\Invokable();
+
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\Service', $pimple['invokable']);
+	}
+
+	/** @test */
+	public function settingNonInvokableObjectShouldTreatItAsParameter()
+	{
+		$pimple = new Container();
+		$pimple['non_invokable'] = new Fixtures\NonInvokable();
+
+		$this->assertInstanceOf('tests\PimpleCopy\Pimple\Fixtures\NonInvokable', $pimple['non_invokable']);
+	}
+
+	/**
+	 * @dataProvider badServiceDefinitionProvider
+	 * @expectedException \InvalidArgumentException
+	 * @expectedExceptionMessage Service definition is not a Closure or invokable object.
+	 */
+	public function testFactoryFailsForInvalidServiceDefinitions($service)
+	{
+		$pimple = new Container();
+		$pimple->factory($service);
+	}
+
+	/**
+	 * @dataProvider badServiceDefinitionProvider
+	 * @expectedException \InvalidArgumentException
+	 * @expectedExceptionMessage Callable is not a Closure or invokable object.
+	 */
+	public function testProtectFailsForInvalidServiceDefinitions($service)
+	{
+		$pimple = new Container();
+		$pimple->protect($service);
+	}
+
+	/**
+	 * @dataProvider badServiceDefinitionProvider
+	 * @expectedException \InvalidArgumentException
+	 * @expectedExceptionMessage Identifier "foo" does not contain an object definition.
+	 */
+	public function testExtendFailsForKeysNotContainingServiceDefinitions($service)
+	{
+		$pimple = new Container();
+		$pimple['foo'] = $service;
+		$pimple->extend('foo', function () {});
+	}
+
+	/**
+	 * @dataProvider badServiceDefinitionProvider
+	 * @expectedException \InvalidArgumentException
+	 * @expectedExceptionMessage Extension service definition is not a Closure or invokable object.
+	 */
+	public function testExtendFailsForInvalidServiceDefinitions($service)
+	{
+		$pimple = new Container();
+		$pimple['foo'] = function () {};
+		$pimple->extend('foo', $service);
+	}
+
+	/**
+	 * Provider for invalid service definitions.
+	 */
+	public function badServiceDefinitionProvider()
+	{
+		return array(
+		  array(123),
+		  array(new Fixtures\NonInvokable()),
+		);
+	}
+
+	/**
+	 * Provider for service definitions.
+	 */
+	public function serviceDefinitionProvider()
+	{
+		return array(
+			array(function ($value) {
+				$service = new Fixtures\Service();
+				$service->value = $value;
+
+				return $service;
+			},),
+			array(new Fixtures\Invokable()),
+		);
+	}
+
+	public function testDefiningNewServiceAfterFreeze()
+	{
+		$pimple = new Container();
+		$pimple['foo'] = function () {
+			return 'foo';
+		};
+		$foo = $pimple['foo'];
+
+		$pimple['bar'] = function () {
+			return 'bar';
+		};
+		$this->assertSame('bar', $pimple['bar']);
+	}
+
+	/**
+	 * @expectedException \RuntimeException
+	 * @expectedExceptionMessage Cannot override frozen service "foo".
+	 */
+	public function testOverridingServiceAfterFreeze()
+	{
+		$pimple = new Container();
+		$pimple['foo'] = function () {
+			return 'foo';
+		};
+		$foo = $pimple['foo'];
+
+		$pimple['foo'] = function () {
+			return 'bar';
+		};
+	}
+
+	public function testRemovingServiceAfterFreeze()
+	{
+		$pimple = new Container();
+		$pimple['foo'] = function () {
+			return 'foo';
+		};
+		$foo = $pimple['foo'];
+
+		unset($pimple['foo']);
+		$pimple['foo'] = function () {
+			return 'bar';
+		};
+		$this->assertSame('bar', $pimple['foo']);
+	}
+
+	public function testExtendingService()
+	{
+		$pimple = new Container();
+		$pimple['foo'] = function () {
+			return 'foo';
+		};
+		$pimple['foo'] = $pimple->extend('foo', function ($foo, $app) {
+			return $foo . '.bar';
+		});
+		$pimple['foo'] = $pimple->extend('foo', function ($foo, $app) {
+			return $foo . '.baz';
+		});
+		$this->assertSame('foo.bar.baz', $pimple['foo']);
+	}
+
+	public function testExtendingServiceAfterOtherServiceFreeze()
+	{
+		$pimple = new Container();
+		$pimple['foo'] = function () {
+			return 'foo';
+		};
+		$pimple['bar'] = function () {
+			return 'bar';
+		};
+		$foo = $pimple['foo'];
+
+		$pimple['bar'] = $pimple->extend('bar', function ($bar, $app) {
+			return $bar . '.baz';
+		});
+		$this->assertSame('bar.baz', $pimple['bar']);
+	}
+
+}