Merge pull request #26 from bluzphp/develop

Migrate for 7.6.1
bluzphp · Jul 28, 2017 · 269b600 · 269b600
2 parents e00902a + b4be854
commit 269b600
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 14 deletions.
diff --git a/src/Command/Db/AbstractDbCommand.php b/src/Command/Db/AbstractDbCommand.php
@@ -42,7 +42,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $phinxArguments['command'] = $commandName;
-        $phinxArguments['--configuration'] = PATH_APPLICATION . DS . 'configs' . DS . 'phinx.php';
+        $phinxArguments['--configuration'] = PATH_APPLICATION .DS. 'configs' .DS. 'phinx.php';
 
         if ($command->getDefinition()->hasOption('environment')) {
             $phinxArguments['--environment'] = 'default';

diff --git a/src/Command/Module/InstallCommand.php b/src/Command/Module/InstallCommand.php
@@ -60,7 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $arguments = [
             'command' => 'require',
-            'packages' => ['bluzphp/module-' . $input->getArgument('module')]
+            'packages' => ['bluzphp/module-'. $input->getArgument('module')]
         ];
 
         // call `composer install` command programmatically

diff --git a/src/Command/Module/RemoveCommand.php b/src/Command/Module/RemoveCommand.php
@@ -60,7 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $arguments = [
             'command' => 'remove',
-            'packages' => ['bluzphp/module-' . $input->getArgument('module')]
+            'packages' => ['bluzphp/module-'. $input->getArgument('module')]
         ];
 
         // call `composer install` command programmatically

diff --git a/src/Command/TestCommand.php b/src/Command/TestCommand.php
@@ -50,7 +50,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         // call `codeception run` command programmatically
         $arguments = [
             'run',
-            '--config ' . PATH_ROOT . DS . 'codeception.yml'
+            '--config '. PATH_ROOT .DS. 'codeception.yml'
         ];
 
         if ($group = $input->getArgument('module')) {
@@ -68,7 +68,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     protected function getCodeceptionApplication()
     {
         // @todo need refactoring this part - move functions to separate files
-        require_once PATH_VENDOR . DS . 'codeception' . DS . 'codeception' . DS . 'autoload.php';
+        require_once PATH_VENDOR .DS. 'codeception' .DS. 'codeception' .DS. 'autoload.php';
 
         $app = new Codeception\Application('Codeception', Codeception\Codecept::VERSION);
         $app->add(new Codeception\Command\Run('run'));

diff --git a/src/Generator/views/controllers/crud.phtml b/src/Generator/views/controllers/crud.phtml
@@ -26,9 +26,7 @@ return function () {
     /**
      * @var Controller $this
      */
-    $crud = new Crud();
-
-    $crud->setCrud(<?=$model?>\Crud::getInstance());
+    $crud = new Crud(<?=$model?>\Crud::getInstance());
 
     $crud->get('system', 'crud/get');
     $crud->post('system', 'crud/post');

diff --git a/src/Generator/views/controllers/rest.phtml b/src/Generator/views/controllers/rest.phtml
@@ -30,9 +30,7 @@ return function () {
     /**
      * @var Controller $this
      */
-    $rest = new Rest();
-
-    $rest->setCrud(<?=$model?>\Crud::getInstance());
+    $rest = new Rest(<?=$model?>\Crud::getInstance());
 
     $rest->head('system', 'rest/head', 'Read');
     $rest->get('system', 'rest/get', 'Read');

diff --git a/tests/Generator/samples/rest.html b/tests/Generator/samples/rest.html
@@ -29,9 +29,7 @@
     /**
      * @var Controller $this
      */
-    $rest = new Rest();
-
-    $rest->setCrud(Users\Crud::getInstance());
+    $rest = new Rest(Users\Crud::getInstance());
 
     $rest->head('system', 'rest/head', 'Read');
     $rest->get('system', 'rest/get', 'Read');