several improvements

- Removed unused several vars and arguments
- Fixed Dom\Selector cache
- Fixed Form::setup method
- Fixed Http\Negotiation class
- Fixed Routing\Redirector
- Packages::version() work without composer instalation for detect inphinit/framework package version

Author: brcontainer

src/Experimental/Dom/Document.php

@@ -155,7 +155,7 @@ public function toArray($type = Document::SIMPLE)
                 throw new DomException('Invalid type', 2);
         }
 
-        return $this->getNodes($this->childNodes, true);
+        return $this->getNodes($this->childNodes);
     }
 
     /**
@@ -429,7 +429,7 @@ private function attrs(\DOMNode $node, array $attributes)
         }
     }
 
-    private function getNodes($nodes, $toplevel = false)
+    private function getNodes($nodes)
     {
         $items = array();
 

src/Experimental/Dom/Selector.php

@@ -185,7 +185,7 @@ private function toXPath($query)
 
         $restore = array_combine(array_values($this->prevent), array_keys($this->prevent));
 
-        return $cache[$query] = '//' . strtr($query, $restore);
+        return self::$cache[$query] = '//' . strtr($query, $restore);
     }
 
     private function putQuotes($arg)

src/Experimental/Form.php

@@ -36,7 +36,7 @@ public static function xhtml($xhtml)
      */
     public static function setup($byType, array $attributes)
     {
-        if (0 !== preg_match('#^(' . self::$alloweds . '|select|form)$#', $type)) {
+        if (0 !== preg_match('#^(' . self::$alloweds . '|select|form)$#', $byType)) {
             self::$preAttrs[$byType] = $attributes;
         }
     }

src/Experimental/Http/Negotiation.php

@@ -100,7 +100,7 @@ public function accept($level = self::HIGH)
      * @throws \Inphinit\Experimental\Exception
      * @return mixed
      */
-    public function getLanguage($$alternative = null)
+    public function getLanguage($alternative = null)
     {
         $headers = $this->acceptLanguage();
         return $headers ? key($headers) : $alternative;
@@ -115,7 +115,7 @@ public function getLanguage($$alternative = null)
      * @throws \Inphinit\Experimental\Exception
      * @return mixed
      */
-    public function getCharset($$alternative = null)
+    public function getCharset($alternative = null)
     {
         $headers = $this->acceptCharset();
         return $headers ? key($headers) : $alternative;
@@ -130,7 +130,7 @@ public function getCharset($$alternative = null)
      * @throws \Inphinit\Experimental\Exception
      * @return mixed
      */
-    public function getEncoding($$alternative = null)
+    public function getEncoding($alternative = null)
     {
         $headers = $this->acceptEncoding();
         return $headers ? key($headers) : $alternative;
@@ -145,7 +145,7 @@ public function getEncoding($$alternative = null)
      * @throws \Inphinit\Experimental\Exception
      * @return mixed
      */
-    public function getAccept($$alternative = null)
+    public function getAccept($alternative = null)
     {
         $headers = $this->accept();
         return $headers ? key($headers) : $alternative;

src/Experimental/Routing/Group.php

@@ -29,7 +29,6 @@ class Group extends Router
     private $levelSecure;
     private $ready = false;
     private $currentPrefixPath;
-    private $callback;
     private $domain;
     private $path;
     private $ns;

src/Experimental/Routing/Quick.php

@@ -170,7 +170,5 @@ public function prepare()
                 Route::set($value[0], $route, $controller . ':' . $value[2]);
             }
         }
-
-        $controller = $classMethods = null;
     }
 }

src/Experimental/Routing/Redirector.php

@@ -28,10 +28,11 @@ class Redirector extends \Inphinit\Routing\Router
     public static function route($route, array $args = array(), $code = 302)
     {
         $verbs = array_keys(parent::$httpRoutes);
+        $route = '/' . ltrim($route, '/');
         $to = false;
 
         foreach ($verbs as $verb) {
-            if (preg_match('#^(GET|ANY) /(|[\s\S]+)$#', $verb, $out) && $out[2] === $verb) {
+            if (preg_match('#^(GET|ANY) (/|/[\s\S]+)$#', $verb, $out) && $out[2] === $route) {
                 $to = $verb;
                 break;
             }
@@ -64,7 +65,7 @@ public static function action($name, array $args = array(), $code = 302)
 
     private static function redirect($verb, $args, $code)
     {
-        if (!$verb) {
+        if ($verb === false) {
             throw new Exception('Route or Action not defined in route', 3);
         }
 

src/Inphinit/App.php

@@ -16,7 +16,7 @@
 class App
 {
     /** Inphinit framework version */
-    const VERSION = '0.4.2';
+    const VERSION = '0.4.3';
 
     private static $events = array();
     private static $configs = array();

src/Inphinit/Packages.php

@@ -11,11 +11,12 @@
 
 class Packages implements \IteratorAggregate
 {
+    private static $composerLock;
     private $composerPath;
     private $classmapName = 'autoload_classmap.php';
     private $psrZeroName = 'autoload_namespaces.php';
     private $psrFourName = 'autoload_psr4.php';
-    private $logs = array();
+    private $log = array();
     private $libs;
 
     /**
@@ -63,7 +64,6 @@ public function auto()
     public function inAutoload()
     {
         $path = INPHINIT_PATH . 'boot/namespaces.php';
-        $i = 0;
 
         if (is_file($path)) {
             $data = include $path;
@@ -171,7 +171,7 @@ public function save($path)
         foreach ($this->libs as $key => $value) {
             $value = self::relativePath($value);
 
-            fwrite($handle, ($first ? '' : ',') . $eol . "    '" . $key . "' => '" . $value . "'");
+            fwrite($handle, ($first ? '' : ',') . "$eol    '$key' => '$value'");
 
             $first = false;
         }
@@ -224,11 +224,18 @@ private static function relativePath($path)
      */
     public static function version($name)
     {
-        $file = INPHINIT_ROOT . 'composer.lock';
-        $data = is_file($file) ? json_decode(file_get_contents($file)) : false;
+        if (self::$composerLock === null) {
+            $file = INPHINIT_ROOT . 'composer.lock';
+
+            if (is_file($file)) {
+                self::$composerLock = json_decode(file_get_contents($file));
+            }
+        }
+
+        $data = self::$composerLock;
 
         if (empty($data->packages)) {
-            return null;
+            return $name === 'inphinit/framework' ? App::VERSION : null;
         }
 
         $version = null;