byjg / php-rest-template

src/builder/_Lib.php

Doc Comments +5 added lines, -2 removed lines

@@ -33,6 +33,9 @@ 
         return $this->systemOs;
     }
 
+    /**
+     * @param string $command
+     */
     public function fixDir($command)
     {
         if ($this->getSystemOs() === "Windows") {
@@ -44,7 +47,7 @@ 
     /**
      * Execute the given command by displaying console output live to the user.
      *
-     * @param string|array $cmd :  command to be executed
+     * @param string $cmd :  command to be executed
      * @return array   exit_status  :  exit status of the executed command
      *                  output       :  console output of the executed command
      * @throws ConfigNotFoundException
@@ -100,7 +103,7 @@ 
     }
 
     /**
-     * @param string|Closure $variableValue
+     * @param string $variableValue
      * @return mixed
      * @throws ConfigNotFoundException
      * @throws EnvironmentException

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
 
     public function __construct()
     {
-        $this->workdir = realpath(__DIR__ . '/../..');
+        $this->workdir = realpath(__DIR__.'/../..');
     }
 
     public function getSystemOs()
@@ -77,7 +77,7 @@ 
 
         while (!feof($proc)) {
             $liveOutput     = fread($proc, 4096);
-            $completeOutput = $completeOutput . $liveOutput;
+            $completeOutput = $completeOutput.$liveOutput;
             echo "$liveOutput";
             @ flush();
         }
@@ -93,9 +93,9 @@ 
         // }
 
         // return exit status and intended output
-        return array (
+        return array(
             'exit_status'  => $exitStatus,
-            'output'       => str_replace("Exit status : " . $matches[0], '', $completeOutput)
+            'output'       => str_replace("Exit status : ".$matches[0], '', $completeOutput)
         );
     }
 
@@ -115,7 +115,7 @@ 
             foreach ($args[0] as $arg) {
                 $variableValue = str_replace(
                     $arg,
-                    Psr11::container()->get(substr($arg,1, -1)),
+                    Psr11::container()->get(substr($arg, 1, -1)),
                     $variableValue
                 );
             }

src/project/Rest/Login.php

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 use ByJG\RestServer\ResponseBag;
 use Psr\SimpleCache\InvalidArgumentException;
 use ReflectionException;
-use RestTemplate\Model\User;
 use Swagger\Annotations as SWG;
 
 class Login extends ServiceAbstractBase

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
         }
 
         $users = Psr11::container()->get(UsersDBDataset::class);
-        $user = $users->getById(new Literal("X'" . str_replace("-", "", $result["data"]["userid"]) . "'"));
+        $user = $users->getById(new Literal("X'".str_replace("-", "", $result["data"]["userid"])."'"));
 
         $metadata = $this->createUserMetadata($user);
         

src/project/Rest/ServiceAbstractBase.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
     {
         $data = $this->requireAuthenticated($token);
         if ($data['role'] !== $role) {
-            throw new Error401Exception('Insufficient privileges - ' . print_r($data, true));
+            throw new Error401Exception('Insufficient privileges - '.print_r($data, true));
         }
         return $data;
     }

src/project/Repository/BaseRepository.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
     public function get($itemId)
     {
         if (!($itemId instanceof Literal) && preg_match("/^\d{8}-?\d{4}-?\d{4}-?\d{4}-?\d{12}$/", $itemId)) {
-            $itemId = new Literal("X'" . str_replace("-", "", $itemId) . "'");
+            $itemId = new Literal("X'".str_replace("-", "", $itemId)."'");
         }
         return $this->repository->get($itemId);
     }
@@ -51,7 +51,7 @@ 
 
         $query = Query::getInstance()
             ->table($this->repository->getMapper()->getTable())
-            ->limit($page*$size, $size);
+            ->limit($page * $size, $size);
 
         if (!empty($orderBy)) {
             if (!is_array($orderBy)) {

src/builder/PostCreateScript.php

Spacing +9 added lines, -9 removed lines

@@ -16,7 +16,7 @@ 
         // ------------------------------------------------
         // Defining function to interatively walking through the directories
         $directory = new RecursiveDirectoryIterator($workdir);
-        $filter = new RecursiveCallbackFilterIterator($directory, function ($current/*, $key, $iterator*/) {
+        $filter = new RecursiveCallbackFilterIterator($directory, function($current/*, $key, $iterator*/) {
             // Skip hidden files and directories.
             if ($current->getFilename()[0] === '.') {
                 return false;
@@ -36,15 +36,15 @@ 
 
         // ------------------------------------------------
         //Replace composer name:
-        $contents = file_get_contents($workdir . '/composer.json');
+        $contents = file_get_contents($workdir.'/composer.json');
         file_put_contents(
-            $workdir . '/composer.json',
+            $workdir.'/composer.json',
             str_replace('byjg/resttemplate', $composerName, $contents)
         );
 
         // ------------------------------------------------
         // Replace Docker PHP Version
-        $files = [ 'docker/Dockerfile', 'docker/Dockerfile-dev' ];
+        $files = ['docker/Dockerfile', 'docker/Dockerfile-dev'];
         foreach ($files as $file) {
             $contents = file_get_contents("$workdir/$file");
             $contents = str_replace('ENV TZ=America/Sao_Paulo', "ENV TZ=${timezone}", $contents);
@@ -58,7 +58,7 @@ 
         // Adjusting config files
         $files = [
             'config/config-dev.php',
-            'config/config-staging.php' ,
+            'config/config-staging.php',
             'config/config-prod.php',
             'config/config-test.php',
             'docker-compose.yml',
@@ -67,7 +67,7 @@ 
         $uri = new Uri($mysqlConnection);
         foreach ($files as $file) {
             $contents = file_get_contents("$workdir/$file");
-            $contents = str_replace( 'jwt_super_secret_key', JwtWrapper::generateSecret(64), $contents);
+            $contents = str_replace('jwt_super_secret_key', JwtWrapper::generateSecret(64), $contents);
             $contents = str_replace('mysql://root:mysqlp455w0rd@mysql-container/mydb', "$mysqlConnection", $contents);
             $contents = str_replace('mysql-container', $uri->getHost(), $contents);
             $contents = str_replace('mysqlp455w0rd', $uri->getPassword(), $contents);
@@ -89,7 +89,7 @@ 
                 // Replace inside Quotes
                 $contents = preg_replace(
                     "/([\'\"])RestTemplate(.*?[\'\"])/",
-                    '$1' . str_replace('\\', '\\\\\\\\', $namespace) . '$2',
+                    '$1'.str_replace('\\', '\\\\\\\\', $namespace).'$2',
                     $contents
                 );
 
@@ -114,14 +114,14 @@ 
 
     public static function run(Event $event)
     {
-        $workdir = realpath(__DIR__ . '/../..');
+        $workdir = realpath(__DIR__.'/../..');
         $stdIo = $event->getIO();
 
         $stdIo->write("========================================================");
         $stdIo->write("  Setup RestTemplate");
         $stdIo->write("========================================================");
         $stdIo->write("");
-        $stdIo->write("Project Directory: " . $workdir);
+        $stdIo->write("Project Directory: ".$workdir);
         $phpVersion = $stdIo->ask('PHP Version [7.2]: ', '7.2');
         $namespace = $stdIo->ask('Project namespace [MyRest]: ', 'MyRest');
         $composerName = $stdIo->ask('Composer name [me/myrest]: ', 'me/myrest');

src/builder/Scripts.php

Spacing +7 added lines, -7 removed lines

@@ -68,13 +68,13 @@ 
 
         $dbConnection = Psr11::container($argumentList["--env"])->get('DBDRIVER_CONNECTION');
 
-        $migration = new Migration(new Uri($dbConnection), $this->workdir . "/db");
+        $migration = new Migration(new Uri($dbConnection), $this->workdir."/db");
         $migration->registerDatabase("mysql", MySqlDatabase::class);
-        $migration->addCallbackProgress(function ($cmd, $version) {
+        $migration->addCallbackProgress(function($cmd, $version) {
             echo "Doing $cmd, $version\n";
         });
 
-        $exec['reset'] = function () use ($migration, $argumentList) {
+        $exec['reset'] = function() use ($migration, $argumentList) {
             if (!$argumentList["--yes"]) {
                 throw new Exception("Reset require the argument --yes");
             }
@@ -83,11 +83,11 @@ 
         };
 
 
-        $exec["update"] = function () use ($migration, $argumentList) {
+        $exec["update"] = function() use ($migration, $argumentList) {
             $migration->update($argumentList["--up-to"], $argumentList["--force"]);
         };
 
-        $exec["version"] = function () use ($migration, $argumentList) {
+        $exec["version"] = function() use ($migration, $argumentList) {
             foreach ($migration->getCurrentVersion() as $key => $value) {
                 echo "$key: $value\n";
             }
@@ -115,7 +115,7 @@ 
             $start = 1;
         }
 
-        for ($i=$start; $i < count($arguments); $i++) {
+        for ($i = $start; $i < count($arguments); $i++) {
             $args = explode("=", $arguments[$i]);
             $ret[$args[0]] = isset($args[1]) ? $args[1] : true;
         }
@@ -133,7 +133,7 @@ 
      */
     public function runGenRestDocs($arguments)
     {
-        $docPath = $this->workdir . '/web/docs/';
+        $docPath = $this->workdir.'/web/docs/';
         chdir($this->workdir);
         $this->liveExecuteCommand(
             $this->fixDir("vendor/bin/swagger")