@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | public function __construct($config, $configPath) |
| 35 | 35 | { |
| 36 | 36 | $this->config = $config; |
| 37 | - $this->fileName = $configPath . '/' . $config . '.php'; |
|
| 37 | + $this->fileName = $configPath.'/'.$config.'.php'; |
|
| 38 | 38 | |
| 39 | 39 | $content = file_get_contents($this->fileName); |
| 40 | 40 | |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | break; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - $pattern = '/\$' . $this->config . '\[\'' . $item . '\'\] = ' . $value . ';/'; |
|
| 72 | + $pattern = '/\$'.$this->config.'\[\''.$item.'\'\] = '.$value.';/'; |
|
| 73 | 73 | |
| 74 | 74 | preg_match_all($pattern, $this->lines[$line], $match); |
| 75 | 75 | |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | $result = array_filter($match[1]); |
| 79 | 79 | $data = ''; |
| 80 | 80 | |
| 81 | - if (! empty($result[0])) { |
|
| 81 | + if ( ! empty($result[0])) { |
|
| 82 | 82 | $data = $result[0]; |
| 83 | 83 | } |
| 84 | 84 | |
@@ -130,10 +130,10 @@ discard block |
||
| 130 | 130 | $length = count($value); |
| 131 | 131 | |
| 132 | 132 | for ($i = 0; $i < $length; $i++) { |
| 133 | - $value[$i] = '\'' . $value[$i] . '\''; |
|
| 133 | + $value[$i] = '\''.$value[$i].'\''; |
|
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - $data = 'array(' . implode(', ', $value) . ')'; |
|
| 136 | + $data = 'array('.implode(', ', $value).')'; |
|
| 137 | 137 | $format = 'array\([^)]*\)'; |
| 138 | 138 | |
| 139 | 139 | break; |
@@ -143,7 +143,7 @@ discard block |
||
| 143 | 143 | |
| 144 | 144 | break; |
| 145 | 145 | case 'string': |
| 146 | - $data = '\'' . $value . '\''; |
|
| 146 | + $data = '\''.$value.'\''; |
|
| 147 | 147 | $format = '(.*?)'; |
| 148 | 148 | |
| 149 | 149 | break; |
@@ -153,8 +153,8 @@ discard block |
||
| 153 | 153 | $data = $value; |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | - $pattern = '/\$' . $this->config . '\[\'' . $item . '\'\] = ' . $format . ';/'; |
|
| 157 | - $replacement = '$' . $this->config . '[\'' . $item . '\'] = ' . $data . ';'; |
|
| 156 | + $pattern = '/\$'.$this->config.'\[\''.$item.'\'\] = '.$format.';/'; |
|
| 157 | + $replacement = '$'.$this->config.'[\''.$item.'\'] = '.$data.';'; |
|
| 158 | 158 | |
| 159 | 159 | $result = preg_replace($pattern, $replacement, $this->lines[$line]); |
| 160 | 160 | |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | if ($validator->fails()) { |
| 46 | 46 | $message = $validator->getMessage(); |
| 47 | 47 | |
| 48 | - return $output->writeln('<error>' . $message . '</error>'); |
|
| 48 | + return $output->writeln('<error>'.$message.'</error>'); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | $data = [ |
@@ -65,12 +65,12 @@ discard block |
||
| 65 | 65 | 'show' => $this->renderer->render('Views/show.tpl', $result) |
| 66 | 66 | ]; |
| 67 | 67 | |
| 68 | - $filePath = APPPATH . 'views/' . $name; |
|
| 68 | + $filePath = APPPATH.'views/'.$name; |
|
| 69 | 69 | |
| 70 | - $create = new File($filePath . '/create.php'); |
|
| 71 | - $edit = new File($filePath . '/edit.php'); |
|
| 72 | - $index = new File($filePath . '/index.php'); |
|
| 73 | - $show = new File($filePath . '/show.php'); |
|
| 70 | + $create = new File($filePath.'/create.php'); |
|
| 71 | + $edit = new File($filePath.'/edit.php'); |
|
| 72 | + $index = new File($filePath.'/index.php'); |
|
| 73 | + $show = new File($filePath.'/show.php'); |
|
| 74 | 74 | |
| 75 | 75 | $create->putContents($results['create']); |
| 76 | 76 | $edit->putContents($results['edit']); |
@@ -82,8 +82,8 @@ discard block |
||
| 82 | 82 | $index->close(); |
| 83 | 83 | $show->close(); |
| 84 | 84 | |
| 85 | - $message = 'The views folder "' . $name . '" has been created successfully!'; |
|
| 85 | + $message = 'The views folder "'.$name.'" has been created successfully!'; |
|
| 86 | 86 | |
| 87 | - return $output->writeln('<info>' . $message . '</info>'); |
|
| 87 | + return $output->writeln('<info>'.$message.'</info>'); |
|
| 88 | 88 | } |
| 89 | 89 | } |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | $this->addLibrary('wildfire'); |
| 37 | 37 | |
| 38 | 38 | $template = $this->renderer->render('Libraries/Wildfire.tpl'); |
| 39 | - $wildfire = new File(APPPATH . 'libraries/Wildfire.php'); |
|
| 39 | + $wildfire = new File(APPPATH.'libraries/Wildfire.php'); |
|
| 40 | 40 | |
| 41 | 41 | $wildfire->putContents($template); |
| 42 | 42 | $wildfire->close(); |
@@ -45,6 +45,6 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | $message = 'Wildfire is now installed successfully!'; |
| 47 | 47 | |
| 48 | - return $output->writeln('<info>' . $message . '</info>'); |
|
| 48 | + return $output->writeln('<info>'.$message.'</info>'); |
|
| 49 | 49 | } |
| 50 | 50 | } |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | $fileName = ucfirst($input->getArgument('name')); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - $path = APPPATH . 'controllers' . DIRECTORY_SEPARATOR . $fileName . '.php'; |
|
| 43 | + $path = APPPATH.'controllers'.DIRECTORY_SEPARATOR.$fileName.'.php'; |
|
| 44 | 44 | |
| 45 | 45 | $info = [ |
| 46 | 46 | 'name' => $fileName, |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | if ($validator->fails()) { |
| 54 | 54 | $message = $validator->getMessage(); |
| 55 | 55 | |
| 56 | - return $output->writeln('<error>' . $message . '</error>'); |
|
| 56 | + return $output->writeln('<error>'.$message.'</error>'); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | $data = [ |
@@ -68,13 +68,13 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | $result = $generator->generate(); |
| 70 | 70 | $controller = $this->renderer->render('Controller.tpl', $result); |
| 71 | - $message = 'The controller "' . $fileName . '" has been created successfully!'; |
|
| 71 | + $message = 'The controller "'.$fileName.'" has been created successfully!'; |
|
| 72 | 72 | |
| 73 | 73 | $file = new File($path); |
| 74 | 74 | |
| 75 | 75 | $file->putContents($controller); |
| 76 | 76 | $file->close(); |
| 77 | 77 | |
| 78 | - return $output->writeln('<info>' . $message . '</info>'); |
|
| 78 | + return $output->writeln('<info>'.$message.'</info>'); |
|
| 79 | 79 | } |
| 80 | 80 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | { |
| 66 | 66 | $fileName = ucfirst(singular($input->getArgument('name'))); |
| 67 | 67 | |
| 68 | - $path = APPPATH . 'models' . DIRECTORY_SEPARATOR . $fileName . '.php'; |
|
| 68 | + $path = APPPATH.'models'.DIRECTORY_SEPARATOR.$fileName.'.php'; |
|
| 69 | 69 | |
| 70 | 70 | $info = [ |
| 71 | 71 | 'name' => $fileName, |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | if ($validator->fails()) { |
| 79 | 79 | $message = $validator->getMessage(); |
| 80 | 80 | |
| 81 | - return $output->writeln('<error>' . $message . '</error>'); |
|
| 81 | + return $output->writeln('<error>'.$message.'</error>'); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | $data = [ |
@@ -92,13 +92,13 @@ discard block |
||
| 92 | 92 | |
| 93 | 93 | $result = $generator->generate(); |
| 94 | 94 | $model = $this->renderer->render('Model.tpl', $result); |
| 95 | - $message = 'The model "' . $fileName . '" has been created successfully!'; |
|
| 95 | + $message = 'The model "'.$fileName.'" has been created successfully!'; |
|
| 96 | 96 | |
| 97 | 97 | $file = new File($path); |
| 98 | 98 | |
| 99 | 99 | $file->putContents($model); |
| 100 | 100 | $file->close(); |
| 101 | 101 | |
| 102 | - return $output->writeln('<info>' . $message . '</info>'); |
|
| 102 | + return $output->writeln('<info>'.$message.'</info>'); |
|
| 103 | 103 | } |
| 104 | 104 | } |
@@ -13,17 +13,17 @@ |
||
| 13 | 13 | $app->console->setVersion('1.2.2'); |
| 14 | 14 | |
| 15 | 15 | $app |
| 16 | - ->setTemplatePath(__DIR__ . '/../src/Templates') |
|
| 17 | - ->setCommandPath(__DIR__ . '/../src/Commands') |
|
| 16 | + ->setTemplatePath(__DIR__.'/../src/Templates') |
|
| 17 | + ->setCommandPath(__DIR__.'/../src/Commands') |
|
| 18 | 18 | ->setCommandNamespace('Rougin\Combustor\Commands'); |
| 19 | 19 | |
| 20 | -$app->injector->delegate('CI_Controller', function () { |
|
| 20 | +$app->injector->delegate('CI_Controller', function() { |
|
| 21 | 21 | return Rougin\SparkPlug\Instance::create(); |
| 22 | 22 | }); |
| 23 | 23 | |
| 24 | 24 | $ci = $app->injector->make('CI_Controller'); |
| 25 | 25 | |
| 26 | -$app->injector->delegate('Rougin\Describe\Describe', function () use ($ci) { |
|
| 26 | +$app->injector->delegate('Rougin\Describe\Describe', function() use ($ci) { |
|
| 27 | 27 | $ci->load->database(); |
| 28 | 28 | $ci->load->helper('inflector'); |
| 29 | 29 | |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | protected function execute(InputInterface $input, OutputInterface $output) |
| 58 | 58 | { |
| 59 | - $layoutPath = APPPATH . 'views/layout'; |
|
| 59 | + $layoutPath = APPPATH.'views/layout'; |
|
| 60 | 60 | |
| 61 | 61 | $data = []; |
| 62 | 62 | |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | $css = '//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css'; |
| 68 | 68 | |
| 69 | - if (! is_dir('bower_components/font-awesome') && system('bower install font-awesome --save')) { |
|
| 69 | + if ( ! is_dir('bower_components/font-awesome') && system('bower install font-awesome --save')) { |
|
| 70 | 70 | $css = '<?php echo base_url(\'bower_components/font-awesome/css/font-awesome.min.css\'); ?>'; |
| 71 | 71 | } |
| 72 | 72 | |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | $js = 'https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.js'; |
| 80 | 80 | $jquery = 'https://code.jquery.com/jquery-2.1.1.min.js'; |
| 81 | 81 | |
| 82 | - if (! is_dir('bower_components/bootstrap') && system('bower install bootstrap#3.3.7 --save')) { |
|
| 82 | + if ( ! is_dir('bower_components/bootstrap') && system('bower install bootstrap#3.3.7 --save')) { |
|
| 83 | 83 | $css = '<?php echo base_url(\'bower_components/bootstrap/dist/css/bootstrap.min.css\'); ?>'; |
| 84 | 84 | $js = '<?php echo base_url(\'bower_components/bootstrap/dist/js/bootstrap.min.js\'); ?>'; |
| 85 | 85 | $jquery = '<?php echo base_url(\'bower_components/jquery/dist/jquery.min.js\'); ?>'; |
@@ -90,17 +90,17 @@ discard block |
||
| 90 | 90 | array_push($data['scripts'], $js); |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - if (! @mkdir($layoutPath, 0777, true)) { |
|
| 93 | + if ( ! @mkdir($layoutPath, 0777, true)) { |
|
| 94 | 94 | $message = 'The layout directory already exists!'; |
| 95 | 95 | |
| 96 | - return $output->writeln('<error>' . $message . '</error>'); |
|
| 96 | + return $output->writeln('<error>'.$message.'</error>'); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | $header = $this->renderer->render('Views/Layout/header.tpl', $data); |
| 100 | 100 | $footer = $this->renderer->render('Views/Layout/footer.tpl', $data); |
| 101 | 101 | |
| 102 | - $headerFile = new File($layoutPath . '/header.php'); |
|
| 103 | - $footerFile = new File($layoutPath . '/footer.php'); |
|
| 102 | + $headerFile = new File($layoutPath.'/header.php'); |
|
| 103 | + $footerFile = new File($layoutPath.'/footer.php'); |
|
| 104 | 104 | |
| 105 | 105 | $headerFile->putContents($header); |
| 106 | 106 | $footerFile->putContents($footer); |
@@ -110,6 +110,6 @@ discard block |
||
| 110 | 110 | |
| 111 | 111 | $message = 'The layout folder has been created successfully!'; |
| 112 | 112 | |
| 113 | - return $output->writeln('<info>' . $message . '</info>'); |
|
| 113 | + return $output->writeln('<info>'.$message.'</info>'); |
|
| 114 | 114 | } |
| 115 | 115 | } |