csfixed work with skippable

hiqdev · Dec 26, 2016 · 02019cd · 02019cd
1 parent 9f4362e
commit 02019cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Builder.php b/src/Builder.php
@@ -241,8 +241,8 @@ public function readConfig($name)
      */
     public function readFile($__path)
     {
-        if (strncmp($__path, '?', 1) === 0) {
-            $__skippable = true;
+        $__skippable = strncmp($__path, '?', 1) === 0 ? '?' : '';
+        if ($__skippable) {
             $__path = substr($__path, 1);
         }
 

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -211,19 +211,19 @@ protected function prepareAliases(PackageInterface $package, $psr)
      */
     public function preparePath(PackageInterface $package, $path)
     {
-        $skippable = false;
-        if (strncmp($path, '?', 1) === 0) {
-            $skippable = true;
+        $skippable = strncmp($path, '?', 1) === 0 ? '?' : '';
+        if ($skippable) {
             $path = substr($path, 1);
         }
+
         if (!$this->getFilesystem()->isAbsolutePath($path)) {
             $prefix = $package instanceof RootPackageInterface
                 ? $this->getBaseDir()
                 : $this->getVendorDir() . '/' . $package->getPrettyName();
             $path = $prefix . '/' . $path;
         }
 
-        return ($skippable ? '?' : '') . $this->getFilesystem()->normalizePath($path);
+        return $skippable . $this->getFilesystem()->normalizePath($path);
     }
 
     /**