Merge branch '1.x' of github.com:php-pds/skeleton into 1.x

Adam16 · Jan 22, 2017 · 75285aa · 75285aa
2 parents 621974d + a8fe032
commit 75285aa
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/docs/tools.md b/docs/tools.md
@@ -5,11 +5,15 @@
 Validate your project's compliance by following these steps:
 
 - Install package in your project: `composer require pds/skeleton @dev`
-- Run the validator: `vendor/bin/pds-skeleton validate`
+- Run the validator: `vendor/bin/pds-skeleton validate [path]`
+
+If no path is specified, the project in which pds-skeleton is installed will be used.
 
 ## Generator
 
 Generate a compliant package skeleton by following these steps:
 
 - Install package in your project: `composer require pds/skeleton @dev`
-- Run the generator: `vendor/bin/pds-skeleton generate`
+- Run the generator: `vendor/bin/pds-skeleton generate [path]`
+
+If no path is specified, the project in which pds-skeleton is installed will be used.
diff --git a/src/ComplianceValidator.php b/src/ComplianceValidator.php
@@ -10,9 +10,9 @@ class ComplianceValidator
 
     protected $files = null;
 
-    public function execute()
+    public function execute($root = null)
     {
-        $lines = $this->getFiles();
+        $lines = $this->getFiles($root);
         $results = $this->validate($lines);
         $this->outputResults($results);
         return true;
@@ -52,12 +52,15 @@ public function validate($lines)
     /**
      * Get list of files and directories previously set, or generate from parent project.
      */
-    public function getFiles()
+    public function getFiles($root = null)
     {
+        $root = $root ?: __DIR__ . '/../../../../';
+        $root = realpath($root);
+
         if ($this->files == null) {
-            $files = scandir(__DIR__ . "/../../../../");
+            $files = scandir($root);
             foreach ($files as $i => $file) {
-                if (is_dir($file)) {
+                if (is_dir("$root/$file")) {
                     $files[$i] .= "/";
                 }
             }

diff --git a/src/Console.php b/src/Console.php
@@ -31,7 +31,7 @@ public function execute($args)
     protected function executeCommand($commandClass, $args)
     {
         $command = new $commandClass();
-        return $command->execute($args);
+        return $command->execute(...$args);
     }
 
     protected function outputHelp()

diff --git a/src/PackageGenerator.php b/src/PackageGenerator.php
@@ -3,23 +3,24 @@
 
 class PackageGenerator
 {
-    public function execute()
+    public function execute($root = null)
     {
         $validator = new ComplianceValidator();
         $lines = $validator->getFiles();
         $validatorResults = $validator->validate($lines);
-        $files = $this->createFiles($validatorResults);
+        $files = $this->createFiles($validatorResults, $root);
         $this->outputResults($files);
         return true;
     }
 
     public function createFiles($validatorResults, $root = null)
     {
-        if ($root == null) {
-            $root = realpath(__DIR__ . "/../../../../");
-        }
+        $root = $root ?: __DIR__ . '/../../../../';
+        $root = realpath($root);
+
         $files = $this->createFileList($validatorResults);
         $createdFiles = [];
+
         foreach ($files as $i => $file) {
             $isDir = substr($file, -1, 1) == '/';
             if ($isDir) {
@@ -33,6 +34,7 @@ public function createFiles($validatorResults, $root = null)
             file_put_contents($path, '');
             chmod($path, 0644);
         }
+
         return $createdFiles;
     }