0.10.11 release.

romeOz · Jul 10, 2015 · fb45223 · fb45223
1 parent 75750e9
commit fb45223
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -18,8 +18,8 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "romeoz/rock-base" : "*@dev",
-        "romeoz/rock-helpers" : "*@dev"
+        "romeoz/rock-base" : "0.10.*",
+        "romeoz/rock-helpers" : "0.11.*"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.7.0"

diff --git a/src/Validate.php b/src/Validate.php
@@ -4,7 +4,6 @@
 
 use rock\base\ObjectInterface;
 use rock\base\ObjectTrait;
-use rock\helpers\Instance;
 use rock\helpers\StringHelper;
 use rock\validate\locale\Locale;
 use rock\validate\rules\Alnum;
@@ -397,7 +396,7 @@ public function __call($name, $arguments)
 
     public static function __callStatic($name, $arguments)
     {
-        return call_user_func_array([static::getInstance(static::className()), $name], $arguments);
+        return call_user_func_array([static::getInstance(), $name], $arguments);
     }
 
     /**
@@ -515,14 +514,14 @@ protected function getInstanceRule($name, array $arguments)
      * Returns instance.
      *
      * If exists {@see \rock\di\Container} that uses it.
-     *
-     * @param string|array $config the configuration. It can be either a string representing the class name
-     *                                     or an array representing the object configuration.
      * @return static
      */
-    protected static function getInstance($config)
+    protected static function getInstance()
     {
-        return Instance::ensure($config, static::className());
+        if (class_exists('\rock\di\Container')) {
+            return \rock\di\Container::load(static::className());
+        }
+        return new static();
     }
 
     protected function defaultRules()