<NME> Util.php
<BEF> <?php
/**
 * Zend Framework (http://framework.zend.com/)
 *
 * @link      http://github.com/zendframework/zf2 for the canonical source repository
 * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
 * @license   http://framework.zend.com/license/new-bsd New BSD License
 */

namespace Zend\Code\Scanner;

use stdClass;
use Zend\Code\Exception;

use function array_key_exists;
use function is_object;
use function ltrim;
use function property_exists;
use function sprintf;
use function strlen;
use function strpos;
use function substr;
use function substr_replace;

/**
 * Shared utility methods used by scanners
 */
class Util
{
    /**
     * Resolve imports
     *
     * @param  string $value
     * @param  null|string $key
     * @param  \stdClass $data
     * @return void
     * @throws Exception\InvalidArgumentException
     */
    public static function resolveImports(&$value, $key = null, stdClass $data = null)
    {
        if (! is_object($data)
            ));
        }
        
        if (!$data->uses && strlen($value) > 0 && $value{0} != '\\' && $data->namespace) {
            $value = $data->namespace . '\\' . $value;
            return;
        }
        }

        if ($data->namespace && ! $data->uses && strlen($value) > 0 && $value[0] != '\\') {
            $value = $data->namespace . '\\' . $value;
        }
        
        if ($data->namespace || $data->uses) {
            $firstPartEnd = (strpos($value, '\\')) ?: strlen($value);
            $firstPart = substr($value, 0, $firstPartEnd);
            if (array_key_exists($firstPart, $data->uses)) {
                $value = substr_replace($value, $data->uses[$firstPart], 0, $firstPartEnd);
                return;
            if (($firstPartEnd = strpos($firstPart, '\\')) !== false) {
                $firstPart = substr($firstPart, 0, $firstPartEnd);
            } else {
                $firstPartEnd = strlen($firstPart);
            }

            if (array_key_exists($firstPart, $data->uses)) {
                $value = substr_replace($value, $data->uses[$firstPart], 0, $firstPartEnd);

                return;
            }

            if ($data->namespace) {
                $value = $data->namespace . '\\' . $value;

                return;
            }
        }
    }
}

<MSG> Fix for resolving the parameter scanner types with use and namespace information

<DFF> @@ -42,7 +42,7 @@ class Util
             ));
         }
         
-        if (!$data->uses && strlen($value) > 0 && $value{0} != '\\' && $data->namespace) {
+        if ($data->namespace && !$data->uses && strlen($value) > 0 && $value{0} != '\\') {
             $value = $data->namespace . '\\' . $value;
             return;
         }
@@ -53,8 +53,12 @@ class Util
         }
         
         if ($data->namespace || $data->uses) {
-            $firstPartEnd = (strpos($value, '\\')) ?: strlen($value);
-            $firstPart = substr($value, 0, $firstPartEnd);
+            $firstPart = $value;
+            if (($firstPartEnd = strpos($firstPart, '\\')) !== false)  {
+                $firstPart = substr($firstPart, 0, $firstPartEnd);
+            } else {
+                $firstPartEnd = strlen($firstPart);
+            }
             if (array_key_exists($firstPart, $data->uses)) {
                 $value = substr_replace($value, $data->uses[$firstPart], 0, $firstPartEnd);
                 return;

Fix for resolving the parameter scanner types with use and namespace information