Merge pull request #11 from znframework/5.9

Fixed protected ZN\Generator::write() method.
znframework · Sep 5, 2018 · 9d0431a · 9d0431a
2 parents 3616732 + 808c330
commit 9d0431a
Showing 1 changed file with 16 additions and 19 deletions.
diff --git a/File.php b/File.php
@@ -158,32 +158,29 @@ protected function path($name, $type)
      */
     protected function write($name, $type, $controller) : Bool
     {
-        if( ! empty($this->settings['path']) )
+        if( ! empty($name) )
         {
-            $filePath = Base::suffix($this->settings['path'], '/') . $name;
-        }
-        else
-        {
-            $filePath = $name;
-        }
-
-        $file = $this->path($filePath, $type);;
-
-        if( ! is_file($file) )
-        {
-            if( file_put_contents($file, $controller) )
+            if( ! empty($this->settings['path']) )
             {
-                return true;
+                $filePath = Base::suffix($this->settings['path'], '/') . $name;
             }
             else
             {
-                return false;
+                $filePath = $name;
+            }
+
+            $file = $this->path($filePath, $type);
+
+            if( ! is_file($file) )
+            {
+                if( file_put_contents($file, $controller) )
+                {
+                    return true;
+                }
             }
         }
-        else
-        {
-            return false;
-        }
+
+        return false;
     }
 
     /**