added tests. renamed package.

Author: frostealth

README.md

@@ -1,49 +1,44 @@
-PHP Resource Locator
+PHP Container
 ====================
 
 Example
 -------
 ```php
 <?php
 
-use frostealth\Locator\Locator;
+use frostealth\Container\Container;
 
-$locator = new Locator();
+$container = new Container();
 
 // ...
 
 // injecting simple values
-$locator->set('foo', 'bar'); // or $locator->foo = 'bar';
+$container->set('foo', 'bar'); // or $container->foo = 'bar';
 
 // get its value
-$value = $locator->get('foo');  // or $value = $locator->foo;
+$value = $container->get('foo');  // or $value = $container->foo;
 
 // ...
 
 // resources 
-$locator->set('object', function ($locator) {
-    return new MyObject($locator->foo);
+$container->set('object', function ($container) {
+    return new MyObject($container->foo);
 });
 
 // get a new instance
-$object = $locator->get('object');
+$object = $container->get('object');
 
 // ...
 
 // singleton resources
-$locator->singleton('log', function ($locator) {
-    return new MyLog($locator->object);
+$container->singleton('log', function ($container) {
+    return new MyLog($container->object);
 });
 
 // get log resource
-$log = $locator->get('log');
+$log = $container->get('log');
 ```
 
-Note
-----
-[Use Locator as singleton](https://github.com/frostealth/php-singleton-trait)
-
 Requirements
 ------------
 * PHP >= 5.4
-* [PHP Data Storage v1.0](https://github.com/frostealth/php-data-storage/releases)

composer.json

@@ -1,21 +1,30 @@
 {
-    "name": "frostealth/php-resource-locator",
-    "description": "PHP Resource Locator",
-    "version" : "1.0.0",
+    "name": "frostealth/php-resource-container",
+    "description": "PHP Container",
+    "keywords": ["di", "container"],
+    "license": "MIT",
     "authors": [
         {
             "name": "Kudinov Ivan",
-            "email": "frostealth@gmail.com"
+            "email": "frostealth@gmail.com",
+            "role": "Developer"
         }
     ],
     "autoload": {
         "psr-4": {
-            "frostealth\\Locator\\": "src/"
+            "frostealth\\": "src/"
         }
     },
-    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "frostealth/php-data-storage": "1.0.*"
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "frostealth\\Container\\tests\\": "tests/"
+        }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "4.2.*"
     }
 }

phpunit.xml.dist

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit bootstrap="vendor/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         stopOnFailure="false">
+
+    <testsuites>
+        <testsuite name="Container Tests">
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
+
+</phpunit>

src/Locator.php renamed to src/Container/Container.php

@@ -1,22 +1,22 @@
 <?php
 
-namespace frostealth\Locator;
+namespace frostealth\Container;
 
 use frostealth\Storage\Data;
 
 /**
- * Class Locator
+ * Class Container
  *
- * @package frostealth\Locator
+ * @package frostealth\Container
  */
-class Locator
+class Container
 {
     /** @var Data */
-    protected $container;
+    protected $storage;
 
     public function __construct()
     {
-        $this->container = new Data();
+        $this->storage = new Data();
     }
 
     /**
@@ -26,7 +26,7 @@ public function __construct()
      */
     public function get($name)
     {
-        $value = $this->container->get($name);
+        $value = $this->storage->get($name);
         if (is_callable($value)) {
             $value = $value($this);
         }
@@ -40,7 +40,7 @@ public function get($name)
      */
     public function set($name, $value)
     {
-        $this->container->set($name, $value);
+        $this->storage->set($name, $value);
     }
 
     /**
@@ -50,28 +50,28 @@ public function set($name, $value)
      */
     public function has($name)
     {
-        return $this->container->has($name);
+        return $this->storage->has($name);
     }
 
     /**
      * @param string $name
      */
     public function remove($name)
     {
-        $this->container->remove($name);
+        $this->storage->remove($name);
     }
 
     /**
      * @param string $name
-     * @param callable $value
+     * @param callable $callable
      */
-    public function singleton($name, \Closure $value)
+    public function singleton($name, \Closure $callable)
     {
-        $this->container->set($name, function () use ($value) {
+        $this->storage->set($name, function () use ($callable) {
             static $instance = null;
 
             if ($instance === null) {
-                $instance = $value($this);
+                $instance = $callable($this);
             }
 
             return $instance;

tests/ContainerTest.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace frostealth\Container\tests;
+
+use frostealth\Container\Container;
+
+/**
+ * Class ContainerTest
+ *
+ * @package frostealth\ContainerTest\tests
+ */
+class ContainerTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var Container */
+    private $container;
+
+    public function setUp()
+    {
+        $this->container = new Container();
+    }
+
+    public function testSetAndGet()
+    {
+        $this->assertNull($this->container->get('unregistered'));
+
+        $obj = $this->getMock('stdClass');
+
+        $this->container->set('obj', $obj);
+        $this->assertSame($obj, $this->container->get('obj'));
+
+        $this->container->set('name', 'Robert');
+        $this->container->set('obj', function (Container $locator) {
+            $obj = $this->getMock('stdClass');
+            $obj->name = $locator->get('name');
+
+            return $obj;
+        });
+
+        $this->assertNotEquals($obj, $this->container->get('obj'));
+
+        $obj->name = $this->container->get('name');
+
+        $this->assertEquals($obj, $this->container->get('obj'));
+        $this->assertNotSame($this->container->get('obj'), $this->container->get('obj'));
+    }
+
+    public function testHas()
+    {
+        $this->assertFalse($this->container->has('simple'));
+
+        $this->container->set('simple', 'simple-def');
+        $this->assertTrue($this->container->has('simple'));
+    }
+
+    public function testRemove()
+    {
+        $this->container->set('name', 'Robert');
+        $this->container->remove('name');
+
+        $this->assertFalse($this->container->has('name'));
+    }
+
+    public function testSingleton()
+    {
+        $this->container->set('string', 'example');
+
+        $obj = $this->getMock('stdClass');
+        $obj->string = 'example';
+
+        $this->container->singleton('singleton', function (Container $Container) {
+            $object = $this->getMock('stdClass');
+            $object->string = $Container->get('string');
+
+            return $object;
+        });
+
+        $this->assertEquals($obj, $this->container->get('singleton'));
+        $this->assertSame($this->container->get('singleton'), $this->container->get('singleton'));
+
+        $this->container->singleton('singleton', function () {
+            return $this->getMock('stdClass');
+        });
+
+        $this->assertInstanceOf('stdClass', $this->container->get('singleton'));
+        $this->assertNotEquals($obj, $this->container->get('singleton'));
+    }
+}
+