Cleaning code

classes/asserter.php

@@ -136,13 +136,13 @@ protected function getTypeOf($mixed)
         return $this->analyzer->getTypeOf($mixed);
     }
 
-    protected function _($string)
+    protected function _(...$arguments)
     {
-        return call_user_func_array([$this->locale, '_'], func_get_args());
+        return call_user_func_array([$this->locale, '_'], $arguments);
     }
 
-    protected function __($singular, $plural, $quantity)
+    protected function __(...$arguments)
     {
-        return call_user_func_array([$this->locale, '__'], func_get_args());
+        return call_user_func_array([$this->locale, '__'], $arguments);
     }
 }

classes/asserter/generator.php

@@ -5,14 +5,13 @@
 use mageekguy\atoum;
 use mageekguy\atoum\asserter;
 use mageekguy\atoum\exceptions;
-use mageekguy\atoum\test\assertion;
 
 class generator
 {
     protected $locale = null;
     protected $resolver = null;
 
-    public function __construct(atoum\locale $locale = null, asserter\resolver $resolver = null, assertion\aliaser $aliaser = null)
+    public function __construct(atoum\locale $locale = null, asserter\resolver $resolver = null)
     {
         $this
             ->setLocale($locale)

classes/asserters/error.php

@@ -79,56 +79,20 @@ public function exists()
             $this->score->deleteError($key);
             $this->pass();
         } else {
-            switch (true) {
-                case $this->type === null && $this->message === null:
-                    $failReason = $this->_('error does not exist');
-                    break;
-
-                case $this->type === null && $this->message !== null:
-                    $failReason = $this->_('error with message \'%s\' does not exist', $this->message);
-                    break;
-
-                case $this->type !== null && $this->message === null:
-                    $failReason = $this->_('error of type %s does not exist', self::getAsString($this->type));
-                    break;
-
-                default:
-                    $failReason = $this->_('error of type %s with message \'%s\' does not exist', self::getAsString($this->type), $this->message);
-            }
-
-            $this->fail($failReason);
+            $this->fail($this->getFailMessage(true));
         }
 
         return $this;
     }
 
     public function notExists()
     {
-        $score = $this->getScore();
-
-        $key = $score->errorExists($this->message, $this->type, $this->messageIsPattern);
+        $key = $this->getScore()->errorExists($this->message, $this->type, $this->messageIsPattern);
 
         if ($key === null) {
             $this->pass();
         } else {
-            switch (true) {
-                case $this->type === null && $this->message === null:
-                    $failReason = $this->_('error exists');
-                    break;
-
-                case $this->type === null && $this->message !== null:
-                    $failReason = $this->_('error with message \'%s\' exists', $this->message);
-                    break;
-
-                case $this->type !== null && $this->message === null:
-                    $failReason = $this->_('error of type %s exists', self::getAsString($this->type));
-                    break;
-
-                default:
-                    $failReason = $this->_('error of type %s with message \'%s\' exists', self::getAsString($this->type), $this->message);
-            }
-
-            $this->fail($failReason);
+            $this->fail($this->getFailMessage());
         }
 
         return $this;
@@ -232,4 +196,23 @@ public static function getAsString($errorType)
                 return 'UNKNOWN';
         }
     }
+
+    private function getFailMessage($negative = false)
+    {
+        $verb = $negative ? 'does not exist' : 'exists';
+
+        switch (true) {
+            case $this->type === null && $this->message === null:
+                return $this->_('error %s', $verb);
+
+            case $this->type === null && $this->message !== null:
+                return $this->_('error with message \'%s\' %s', $this->message, $verb);
+
+            case $this->type !== null && $this->message === null:
+                return $this->_('error of type %s %s', self::getAsString($this->type), $verb);
+
+            default:
+                return $this->_('error of type %s with message \'%s\' %s', self::getAsString($this->type), $this->message, $verb);
+        }
+    }
 }

classes/asserters/phpArray.php

@@ -410,17 +410,9 @@ protected function notContainsValue($value, $failMessage, $strict)
 
     protected function intersect(array $values, $failMessage, $strict)
     {
-        $this->valueIsSet();
-
-        $unknownValues = [];
-
-        foreach ($values as $value) {
-            if (in_array($value, $this->value, $strict) === false) {
-                $unknownValues[] = $value;
-            }
-        }
+        $unknownValues = $this->valueIsSet()->getDifference($values, $strict);
 
-        if (count($unknownValues) <= 0) {
+        if (count($unknownValues) === 0) {
             $this->pass();
         } else {
             if ($failMessage === null) {
@@ -439,17 +431,9 @@ protected function intersect(array $values, $failMessage, $strict)
 
     protected function notIntersect(array $values, $failMessage, $strict)
     {
-        $this->valueIsSet();
-
-        $knownValues = [];
-
-        foreach ($values as $value) {
-            if (in_array($value, $this->value, $strict) === true) {
-                $knownValues[] = $value;
-            }
-        }
+        $knownValues = $this->valueIsSet()->getIntersection($values, $strict);
 
-        if (count($knownValues) <= 0) {
+        if (count($knownValues) === 0) {
             $this->pass();
         } else {
             if ($failMessage === null) {
@@ -466,6 +450,28 @@ protected function notIntersect(array $values, $failMessage, $strict)
         return $this;
     }
 
+    protected function getIntersection(array $values, $strict)
+    {
+        return $this->getValues($values, true, $strict);
+    }
+
+    protected function getDifference(array $values, $strict)
+    {
+        return $this->getValues($values, false, $strict);
+    }
+
+    protected function getValues(array $values, $equal, $strict)
+    {
+        return array_values(
+            array_filter(
+                $values,
+                function($value) use ($strict, $equal) {
+                    return in_array($value, $this->value, $strict) === $equal;
+                }
+            )
+        );
+    }
+
     protected function valueIsSet($message = 'Array is undefined')
     {
         return parent::valueIsSet($message);

classes/autoloader.php

@@ -317,7 +317,7 @@ protected function getClassAlias($class)
 
     protected function handleNamespaceOfClass($class)
     {
-        foreach ($this->directories as $namespace => $directories) {
+        foreach (array_keys($this->directories) as $namespace) {
             if (strpos($class, $namespace) === 0) {
                 return true;
             }

classes/configurator.php

@@ -12,7 +12,7 @@ public function __construct(scripts\runner $script)
         $this->script = $script;
 
         foreach ($this->script->getHelp() as $help) {
-            list($arguments, $values) = $help;
+            list($arguments) = $help;
 
             foreach ($arguments as $argument) {
                 $this->methods[strtolower(str_replace('-', '', $argument))] = $argument;

classes/mock/generator.php

@@ -182,7 +182,7 @@ public function getMockedClassCode($class, $mockNamespace = null, $mockClass = n
         }
 
         if ($this->adapter->class_exists($class, true) === false && $this->adapter->interface_exists($class, true) === false) {
-            $code = self::generateUnknownClassCode($class, $mockNamespace, $mockClass, $this->eachInstanceIsUnique);
+            $code = self::generateUnknownClassCode($mockNamespace, $mockClass, $this->eachInstanceIsUnique);
         } else {
             $reflectionClass = call_user_func($this->reflectionClassFactory, $class);
 
@@ -884,7 +884,7 @@ protected static function generateGetMockedMethod(array $mockedMethodNames)
         ;
     }
 
-    protected static function generateUnknownClassCode($class, $mockNamespace, $mockClass, $uniqueId = false, $useStrictTypes = false)
+    protected static function generateUnknownClassCode($mockNamespace, $mockClass, $uniqueId = false, $useStrictTypes = false)
     {
         return ($useStrictTypes ? 'declare(strict_types=1);' . PHP_EOL  : '') .
             'namespace ' . ltrim($mockNamespace, '\\') . ' {' . PHP_EOL .

classes/php/tokenizer.php

@@ -33,7 +33,7 @@ public function tokenize($string)
     {
         $this->currentIterator = $this->iterator;
 
-        foreach ($this->tokens = new \arrayIterator(token_get_all($string)) as $key => $token) {
+        foreach ($this->tokens = new \arrayIterator(token_get_all($string)) as $token) {
             switch ($token[0]) {
                 case T_CONST:
                     $token = $this->appendConstant();
@@ -228,39 +228,6 @@ private function appendCommentAndWhitespace()
         }
     }
 
-    private function appendArray()
-    {
-        $this->appendCommentAndWhitespace();
-
-        $this->tokens->next();
-
-        if ($this->tokens->valid() === true) {
-            $token = $this->tokens->current();
-
-            if ($token[0] === '(') {
-                $this->currentIterator->append(new token($token[0], isset($token[1]) === false ? null : $token[1], isset($token[2]) === false ? null : $token[2]));
-
-                $stack = 1;
-
-                while ($stack > 0 && $this->tokens->valid() === true) {
-                    $this->tokens->next();
-
-                    if ($this->tokens->valid() === true) {
-                        $token = $this->tokens->current();
-
-                        if ($token[0] === '(') {
-                            $stack++;
-                        } elseif ($token[0] === ')') {
-                            $stack--;
-                        }
-
-                        $this->currentIterator->append(new token($token[0], isset($token[1]) === false ? null : $token[1], isset($token[2]) === false ? null : $token[2]));
-                    }
-                }
-            }
-        }
-    }
-
     private function nextTokenIs($tokenName, array $skipedTags = [T_WHITESPACE, T_COMMENT, T_INLINE_HTML])
     {
         $key = $this->tokens->key() + 1;

classes/report/fields/runner/coverage/html.php

@@ -75,7 +75,7 @@ public function __toString()
 
                 ksort($classes, \SORT_STRING);
 
-                foreach ($classes as $className => $classFile) {
+                foreach (array_keys($classes) as $className) {
                     $classCoverageTemplates->className = $className;
                     $classCoverageTemplates->classUrl = str_replace('\\', '/', $className) . self::htmlExtensionFile;
 

classes/report/fields/runner/coverage/treemap.php

@@ -54,7 +54,7 @@ public function __toString()
                     'children' => []
                 ];
 
-                foreach ($this->coverage->getClasses() as $className => $classPath) {
+                foreach (array_keys($this->coverage->getClasses()) as $className) {
                     $node = & $nodes;
 
                     $class = new \reflectionClass($className);