Skip to content

Commit

Permalink
Update version to v1.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
rougin committed Sep 4, 2016
1 parent a8213de commit 059bca2
Show file tree
Hide file tree
Showing 30 changed files with 96 additions and 88 deletions.
1 change: 1 addition & 0 deletions .styleci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
preset: psr2
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@

All notable changes to `Combustor` will be documented in this file.

## [Unreleased](https://github.com/rougin/combustor/compare/v1.2.1...HEAD)
## [1.2.2](https://github.com/rougin/combustor/compare/v1.2.1...v1.2.2) - 2016-09-04

### Changed
- From `$table` to `$new_table` in `Wildfire.tpl`

### Fixed
- Updating configuration files on Windows platform
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The MIT License (MIT)

Copyright (c) 2015 Rougin Royce Gutib <rougingutib@gmail.com>
Copyright (c) 2016 Rougin Royce Gutib <rougingutib@gmail.com>

> Permission is hereby granted, free of charge, to any person obtaining a copy
> of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion bin/combustor.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// Application details
$app->console->setName('Combustor');
$app->console->setVersion('1.2.0');
$app->console->setVersion('1.2.2');

$app
->setTemplatePath(__DIR__ . '/../src/Templates')
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
],
"require": {
"php" : ">=5.4.0",
"rougin/blueprint": "^0.1.0",
"rougin/describe": "^1.4.0",
"rougin/spark-plug": "^0.4.2"
"rougin/blueprint": "~0.1",
"rougin/describe": "~1.4",
"rougin/spark-plug": "~0.4"
},
"require-dev": {
"phpunit/phpunit" : "4.*",
"scrutinizer/ocular": "~1.1",
"rougin/codeigniter": "^3.0.0"
"rougin/codeigniter": "~3.0"
},
"bin": [
"bin/combustor",
Expand Down
8 changes: 4 additions & 4 deletions src/Commands/AbstractCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Abstract Command
*
* Extends the Symfony\Console\Command class with Twig's renderer.
*
*
* @package Combustor
* @author Rougin Royce Gutib <rougingutib@gmail.com>
*/
Expand Down Expand Up @@ -62,17 +62,17 @@ protected function configure()
'Name of the table'
)->addOption(
'bootstrap',
NULL,
null,
InputOption::VALUE_NONE,
'Includes the Bootstrap CSS/JS Framework tags'
)->addOption(
'camel',
NULL,
null,
InputOption::VALUE_NONE,
'Uses the camel case naming convention'
)->addOption(
'keep',
NULL,
null,
InputOption::VALUE_NONE,
'Keeps the name to be used'
);
Expand Down
4 changes: 2 additions & 2 deletions src/Commands/CreateControllerCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Create Controller Command
*
* Generates a Wildfire or Doctrine-based controller for CodeIgniter.
*
*
* @package Combustor
* @author Rougin Royce Gutib <rougingutib@gmail.com>
*/
Expand All @@ -27,7 +27,7 @@ class CreateControllerCommand extends AbstractCommand

/**
* Executes the command.
*
*
* @param \Symfony\Component\Console\Input\InputInterface $input
* @param \Symfony\Component\Console\Output\OutputInterface $output
* @return object|\Symfony\Component\Console\Output\OutputInterface
Expand Down
12 changes: 6 additions & 6 deletions src/Commands/CreateLayoutCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Create Layout Command
*
* Creates a new header and footer file for CodeIgniter
*
*
* @package Combustor
* @author Rougin Royce Gutib <rougingutib@gmail.com>
*/
Expand All @@ -41,15 +41,15 @@ protected function configure()
->setDescription('Creates a new header and footer file')
->addOption(
'bootstrap',
NULL,
null,
InputOption::VALUE_NONE,
'Includes the Bootstrap CSS/JS Framework tags'
);
}

/**
* Executes the command.
*
*
* @param \Symfony\Component\Console\Input\InputInterface $input
* @param \Symfony\Component\Console\Output\OutputInterface $output
* @return object|\Symfony\Component\Console\Output\OutputInterface
Expand All @@ -66,7 +66,7 @@ protected function execute(InputInterface $input, OutputInterface $output)

$css = '//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css';

if ( ! is_dir('bower_components/font-awesome') && system('bower install font-awesome')) {
if (! is_dir('bower_components/font-awesome') && system('bower install font-awesome')) {
$css = '<?php echo base_url(\'bower_components/font-awesome/css/font-awesome.min.css\'); ?>';
}

Expand All @@ -79,7 +79,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
$js = 'https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.js';
$jquery = 'https://code.jquery.com/jquery-2.1.1.min.js';

if ( ! is_dir('bower_components/bootstrap') && system('bower install bootstrap')) {
if (! is_dir('bower_components/bootstrap') && system('bower install bootstrap')) {
$css = '<?php echo base_url(\'bower_components/bootstrap/dist/css/bootstrap.min.css\'); ?>';
$js = '<?php echo base_url(\'bower_components/bootstrap/dist/js/bootstrap.min.js\'); ?>';
$jquery = '<?php echo base_url(\'bower_components/jquery/dist/jquery.min.js\'); ?>';
Expand All @@ -90,7 +90,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
array_push($data['scripts'], $js);
}

if ( ! @mkdir($layoutPath, 0777, true)) {
if (! @mkdir($layoutPath, 0777, true)) {
$message = 'The layout directory already exists!';

return $output->writeln('<error>' . $message . '</error>');
Expand Down
8 changes: 4 additions & 4 deletions src/Commands/CreateModelCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* Create Model Command
*
* Generates a Wildfire or Doctrine-based model for CodeIgniter
*
*
* @package Combustor
* @author Rougin Royce Gutib <rougingutib@gmail.com>
*/
Expand All @@ -43,20 +43,20 @@ protected function configure()
'Name of the table'
)->addOption(
'camel',
NULL,
null,
InputOption::VALUE_NONE,
'Uses the camel case naming convention'
)->addOption(
'lowercase',
NULL,
null,
InputOption::VALUE_NONE,
'Keeps the first character of the name to lowercase'
);
}

/**
* Executes the command.
*
*
* @param \Symfony\Component\Console\Input\InputInterface $input
* @param \Symfony\Component\Console\Output\OutputInterface $output
* @return object|\Symfony\Component\Console\Output\OutputInterface
Expand Down
8 changes: 4 additions & 4 deletions src/Commands/CreateScaffoldCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
* Generates a Wildfire or Doctrine-based controller,
* model and view files for CodeIgniter
*
*
* @package Combustor
* @author Rougin Royce Gutib <rougingutib@gmail.com>
*/
Expand Down Expand Up @@ -45,12 +45,12 @@ protected function configure()
'Name of the table'
)->addOption(
'bootstrap',
NULL,
null,
InputOption::VALUE_NONE,
'Includes the Bootstrap CSS/JS Framework tags'
)->addOption(
'camel',
NULL,
null,
InputOption::VALUE_NONE,
'Uses the camel case naming convention'
)->addOption(
Expand All @@ -68,7 +68,7 @@ protected function configure()

/**
* Executes the command.
*
*
* @param \Symfony\Component\Console\Input\InputInterface $input
* @param \Symfony\Component\Console\Output\OutputInterface $output
* @return object|\Symfony\Component\Console\Output\OutputInterface
Expand Down
4 changes: 2 additions & 2 deletions src/Commands/CreateViewCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Create View Command
*
* Creates a list of views for CodeIgniter
*
*
* @package Combustor
* @author Rougin Royce Gutib <rougingutib@gmail.com>
*/
Expand All @@ -27,7 +27,7 @@ class CreateViewCommand extends AbstractCommand

/**
* Executes the command.
*
*
* @param \Symfony\Component\Console\Input\InputInterface $input
* @param \Symfony\Component\Console\Output\OutputInterface $output
* @return object|\Symfony\Component\Console\Output\OutputInterface
Expand Down
6 changes: 3 additions & 3 deletions src/Commands/InstallDoctrineCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* Install Doctrine Command
*
* Installs Doctrine for CodeIgniter
*
*
* @package Combustor
* @author Rougin Royce Gutib <rougingutib@gmail.com>
*/
Expand All @@ -26,7 +26,7 @@ class InstallDoctrineCommand extends InstallCommand

/**
* Executes the command.
*
*
* @param \Symfony\Component\Console\Input\InputInterface $input
* @param \Symfony\Component\Console\Output\OutputInterface $output
* @return object|\Symfony\Component\Console\Output\OutputInterface
Expand All @@ -50,7 +50,7 @@ protected function execute(InputInterface $input, OutputInterface $output)

$this->addLibrary('doctrine');

if ( ! is_dir(APPPATH . 'models/proxies')) {
if (! is_dir(APPPATH . 'models/proxies')) {
mkdir(APPPATH . 'models/proxies');
chmod(APPPATH . 'models/proxies', 0777);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Commands/InstallWildfireCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* Install Wildfire Command
*
* Installs Wildfire for CodeIgniter
*
*
* @package Combustor
* @author Rougin Royce Gutib <rougingutib@gmail.com>
*/
Expand All @@ -26,7 +26,7 @@ class InstallWildfireCommand extends InstallCommand

/**
* Executes the command.
*
*
* @param \Symfony\Component\Console\Input\InputInterface $input
* @param \Symfony\Component\Console\Output\OutputInterface $output
* @return object|\Symfony\Component\Console\Output\OutputInterface
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/RemoveDoctrineCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Remove Doctrine Command
*
* Removes Doctrine from CodeIgniter
*
*
* @package Combustor
* @author Rougin Royce Gutib <rougingutib@gmail.com>
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Commands/RemoveWildfireCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Remove Wildfire Command
*
* Removes Wildfire from CodeIgniter
*
*
* @package Combustor
* @author Rougin Royce Gutib <rougingutib@gmail.com>
*/
Expand Down
6 changes: 3 additions & 3 deletions src/Common/Commands/InstallCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* Install Command
*
* Installs Doctrine/Wildfire library for CodeIgniter.
*
*
* @package Combustor
* @author Rougin Royce Gutib <rougingutib@gmail.com>
*/
Expand Down Expand Up @@ -50,7 +50,7 @@ protected function configure()

/**
* Adds the specified library in the autoload.php.
*
*
* @param string $library
* @return void
*/
Expand All @@ -60,7 +60,7 @@ protected function addLibrary($library)

$libraries = $autoload->get('libraries', 60, 'array');

if ( ! in_array($library, $libraries)) {
if (! in_array($library, $libraries)) {
array_push($libraries, $library);

$autoload->set('libraries', 60, $libraries, 'array');
Expand Down
4 changes: 2 additions & 2 deletions src/Common/Commands/RemoveCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* Remove Command
*
* Removes Doctrine/Wildfire library from CodeIgniter.
*
*
* @package Combustor
* @author Rougin Royce Gutib <rougingutib@gmail.com>
*/
Expand Down Expand Up @@ -53,7 +53,7 @@ protected function configure()

/**
* Executes the command.
*
*
* @param \Symfony\Component\Console\Input\InputInterface $input
* @param \Symfony\Component\Console\Output\OutputInterface $output
* @return OutputInterface
Expand Down
10 changes: 5 additions & 5 deletions src/Common/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Config
*
* A simple object-oriented interface for handling CodeIgniter's configurations.
*
*
* @package Combustor
* @author Rougin Royce Gutib <rougingutib@gmail.com>
*/
Expand Down Expand Up @@ -43,7 +43,7 @@ public function __construct($config, $configPath)

/**
* Returns the specified value from the config item.
*
*
* @param string $item
* @param integer $line
* @param string $dataType
Expand Down Expand Up @@ -113,7 +113,7 @@ public function get($item, $line, $dataType)

/**
* Sets an value to an item in the config.
*
*
* @param string $item
* @param integer $line
* @param mixed $value
Expand Down Expand Up @@ -163,7 +163,7 @@ public function set($item, $line, $value, $dataType, $exact = false)

/**
* Saves the current config.
*
*
* @return void
*/
public function save()
Expand All @@ -173,7 +173,7 @@ public function save()

/**
* Returns the whole class into a string.
*
*
* @return string
*/
public function __toString()
Expand Down
Loading

0 comments on commit 059bca2

Please sign in to comment.