added interface; changed namespace

Author: frostealth

.gitattributes

@@ -0,0 +1,4 @@
+.gitattributes export-ignore
+.gitignore export-ignore
+tests export-ignore
+phpunit-xml.dist export-ignore

.gitignore

@@ -8,4 +8,5 @@ thumbs.db
 .settings
 .idea
 composer.lock
+composer.phar
 vendor/*

LICENSE.md

@@ -0,0 +1,9 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Ivan Kudinov
+
+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.

README.md

@@ -1,11 +1,10 @@
-PHP Container
-====================
+# PHP Container
 
-Example
--------
-```php
-<?php
+Simple Dependency Injection Container.
+
+## Usage
 
+```php
 use frostealth\Container\Container;
 
 $container = new Container();
@@ -39,6 +38,28 @@ $container->singleton('log', function ($container) {
 $log = $container->get('log');
 ```
 
-Requirements
-------------
+## Dependency Injection
+
+```php
+use Interop\Container\ContainerInterface;
+
+class MyClass
+{
+    /**
+     * @var ContainerInterface
+     */
+    protected $container;
+
+    /**
+     * @param ContainerInterface $container
+     */
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+}
+```
+
+## Requirements
+
 * PHP >= 5.4

composer.json

@@ -1,33 +1,26 @@
 {
-  "name": "frostealth/php-container",
-  "description": "PHP Container",
-  "keywords": [
-    "di",
-    "container"
-  ],
-  "license": "MIT",
-  "authors": [
-    {
-      "name": "Ivan Kudinov",
-      "email": "frostealth@gmail.com",
-      "homepage": "http://frostealth.ru"
+    "name": "frostealth/php-container",
+    "description": "Simple Dependency Injection Container",
+    "keywords": ["di", "dependency injection", "container"],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Ivan Kudinov",
+            "email": "frostealth@gmail.com",
+            "homepage": "http://frostealth.ru"
+        }
+    ],
+    "require": {
+        "php": ">=5.4.0",
+        "container-interop/container-interop": "~1.0",
+        "frostealth/php-data-storage": "~2.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "frostealth\\": "src/"
+        }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "4.2.*"
     }
-  ],
-  "autoload": {
-    "psr-4": {
-      "frostealth\\": "src/"
-    }
-  },
-  "require": {
-    "php": ">=5.4.0",
-    "frostealth/php-data-storage": "1.0.*"
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "frostealth\\Tests\\Container\\": "tests/"
-    }
-  },
-  "require-dev": {
-    "phpunit/phpunit": "4.2.*"
-  }
 }

src/Container/Container.php renamed to src/container/Container.php

@@ -1,22 +1,38 @@
 <?php
 
-namespace frostealth\Container;
+namespace frostealth\container;
 
-use frostealth\Storage\Data;
+use frostealth\container\exceptions\ContainerException;
+use frostealth\storage\Data;
+use frostealth\storage\DataInterface;
+use Interop\Container\ContainerInterface;
 
 /**
  * Class Container
  *
- * @package frostealth\Container
+ * @package frostealth\container
  */
-class Container
+class Container implements ContainerInterface
 {
-    /** @var Data */
+    /**
+     * @var DataInterface
+     */
     protected $storage;
 
-    public function __construct()
+    /**
+     * @param array|DataInterface $values
+     */
+    public function __construct($values = [])
     {
-        $this->storage = new Data();
+        if (is_array($values)) {
+            $values = new Data($values);
+        }
+
+        if (!$values instanceof DataInterface) {
+            throw new ContainerException('Expected a DataInterface');
+        }
+
+        $this->storage = $values;
     }
 
     /**
@@ -36,7 +52,7 @@ public function get($name)
 
     /**
      * @param string $name
-     * @param mixed $value
+     * @param mixed  $value
      */
     public function set($name, $value)
     {
@@ -62,7 +78,9 @@ public function remove($name)
     }
 
     /**
-     * @param string $name
+     * Ensure a value or object will remain globally unique
+     *
+     * @param string   $name
      * @param callable $callable
      */
     public function singleton($name, callable $callable)
@@ -78,6 +96,19 @@ public function singleton($name, callable $callable)
         });
     }
 
+    /**
+     * Protect closure from being directly invoked
+     *
+     * @param string   $name
+     * @param callable $callable
+     */
+    public function protect($name, callable $callable)
+    {
+        $this->storage->set($name, function () use ($callable) {
+            return $callable;
+        });
+    }
+
     /**
      * @param string $name
      *
@@ -90,7 +121,7 @@ public function __get($name)
 
     /**
      * @param string $name
-     * @param mixed $value
+     * @param mixed  $value
      */
     public function __set($name, $value)
     {

src/container/exceptions/ContainerException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace frostealth\container\exceptions;
+
+use Interop\Container\Exception\ContainerException as InteropContainerException;
+use RuntimeException;
+
+/**
+ * Class ContainerException
+ *
+ * @package frostealth\container
+ */
+class ContainerException extends RuntimeException implements InteropContainerException
+{
+
+}

tests/ContainerTest.php

@@ -1,13 +1,9 @@
 <?php
 
-namespace frostealth\Tests\Container;
-
-use frostealth\Container\Container;
+use frostealth\container\Container;
 
 /**
  * Class ContainerTest
- *
- * @package frostealth\Tests\Container
  */
 class ContainerTest extends \PHPUnit_Framework_TestCase
 {