small updates

Author: frostealth

.gitignore

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

composer.json

@@ -1,30 +1,33 @@
 {
-    "name": "frostealth/php-container",
-    "description": "PHP Container",
-    "keywords": ["di", "container"],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Kudinov Ivan",
-            "email": "frostealth@gmail.com",
-            "role": "Developer"
-        }
-    ],
-    "autoload": {
-        "psr-4": {
-            "frostealth\\": "src/"
-        }
-    },
-    "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.*"
+  "name": "frostealth/php-container",
+  "description": "PHP Container",
+  "keywords": [
+    "di",
+    "container"
+  ],
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Ivan Kudinov",
+      "email": "frostealth@gmail.com",
+      "homepage": "http://frostealth.ru"
     }
+  ],
+  "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

@@ -28,7 +28,7 @@ public function get($name)
     {
         $value = $this->storage->get($name);
         if (is_callable($value)) {
-            $value = $value($this);
+            $value = call_user_func($value, $this);
         }
 
         return $value;
@@ -65,13 +65,13 @@ public function remove($name)
      * @param string $name
      * @param callable $callable
      */
-    public function singleton($name, \Closure $callable)
+    public function singleton($name, callable $callable)
     {
         $this->storage->set($name, function () use ($callable) {
             static $instance = null;
 
             if ($instance === null) {
-                $instance = $callable($this);
+                $instance = call_user_func($callable, $this);
             }
 
             return $instance;

tests/ContainerTest.php

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