Skip to content

Commit

Permalink
console bugs fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
steevenz committed Jun 22, 2020
1 parent 588474f commit 3fa0ab3
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 1,058 deletions.
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.idea
*/.DS_Store
cache
vendor/
.composer.lock
.DS_Store
/cache
/app/Config/Development
/vendor
2 changes: 1 addition & 1 deletion app/Cli/Commander.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* Class Commander
* @package App\Cli
*/
class Commander extends \O2System\Reactor\Cli\Commander
class Commander extends \O2System\Framework\Cli\Commander
{

}
2 changes: 1 addition & 1 deletion app/Commanders/Hello.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function optionName( $name )
*/
public function execute()
{
$this->__callOptions();
parent::execute();

output()->write('Hello !');
}
Expand Down
12 changes: 11 additions & 1 deletion app/Config/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,17 @@
*
* @var array
*/
$config[ 'language' ] = 'en-US';
$config[ 'language' ][ 'default' ] = 'en-US';

/**
* Language Options
*
* @var array
*/
$config[ 'language' ][ 'options' ] = [
'en-US' => 'English (United States)',
'id-ID' => 'Bahasa Indonesia'
];

/**
* DateTime Timezone
Expand Down
44 changes: 22 additions & 22 deletions app/app.jsprop → app/app.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"name": "Cli Application",
"created": "29 January 2018",
"version": "1.0.0",
"description": "Cli application example",
"copyright": "Copyright (c) 2018 - Steeve Andrian Salim",
"authors": [
{
"name": "Steeve Andrian Salim",
"email": "steevenz@ymail.com",
"homepage": "http://o2system.id",
"role": "Founder"
}
],
"support": {
"email": "support@o2system.id",
"issues": "https://o2system.id/support"
},
"links": {
"info": "http://www.o2system.id/about",
"wiki": "http://www.o2system.id/wiki"
}
{
"name": "Cli Application",
"created": "29 January 2018",
"version": "1.0.0",
"description": "Cli application example",
"copyright": "Copyright (c) 2018 - Steeve Andrian Salim",
"authors": [
{
"name": "Steeve Andrian Salim",
"email": "steevenz@ymail.com",
"homepage": "http://o2system.id",
"role": "Founder"
}
],
"support": {
"email": "support@o2system.id",
"issues": "https://o2system.id/support"
},
"links": {
"info": "http://www.o2system.id/about",
"wiki": "http://www.o2system.id/wiki"
}
}
3 changes: 1 addition & 2 deletions app/console
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#!/usr/bin/php -q
<?php
/**
* This file is part of the O2System PHP Framework package.
Expand Down Expand Up @@ -32,7 +31,7 @@ $welcomeNote = <<<WELCOME_NOTE
\___|\___/|_||_| /__/\___/|_|\___|
WELCOME_NOTE;

$cliApp = new O2System\Reactor\Cli\App();
$cliApp = new O2System\Framework\Cli\App();
$cliApp
->setWelcomeNote( ( new \O2System\Kernel\Cli\Writers\Text )
->setContextualClass( \O2System\Kernel\Cli\Writers\Text::DANGER )
Expand Down
4 changes: 2 additions & 2 deletions cli.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,6 @@
* STARTUP O2SYSTEM
* ------------------------------------------------------
*/
if ( class_exists( 'O2System\Reactor', false ) ) {
O2System\Reactor::getInstance();
if ( class_exists( 'O2System\Framework', false ) ) {
O2System\Framework::getInstance();
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "project",
"require": {
"php": "^7.2.0",
"o2system/reactor": "*"
"o2system/framework": "^5.7"
},
"require-dev": {
"o2system/gear": "*"
Expand Down
Loading

0 comments on commit 3fa0ab3

Please sign in to comment.