From bd2567879a91034e6ff364cd257c72d7948dc03f Mon Sep 17 00:00:00 2001 From: Daison Carino Date: Thu, 13 Apr 2017 23:28:02 +0000 Subject: [PATCH 1/4] updating packages version --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 00811c8..57cf6c7 100644 --- a/composer.json +++ b/composer.json @@ -27,14 +27,14 @@ "composer/composer": "^1.0", "fzaninotto/faker": "~1.4", "guzzlehttp/guzzle": "6.1.*", - "illuminate/support": "5.2.*", + "illuminate/support": "^5.5", "jenssegers/blade": "^1.0", "paragonie/random_compat": "1.1.*", "league/flysystem": "^1.0", "league/tactician": "^0.6", - "mailgun/mailgun-php": "~1.7.2", + "mailgun/mailgun-php": "2.2.*", "monolog/monolog": "^1.15", - "robmorgan/phinx": "0.5.*", + "robmorgan/phinx": "0.8.*", "swiftmailer/swiftmailer": "^5.4", "symfony/console": "^2.7", "symfony/debug": "^2.7", From bdd3f938e3c7e60f2e54559f55ffd31ef8ab9e1a Mon Sep 17 00:00:00 2001 From: Daison Carino Date: Thu, 13 Apr 2017 23:33:35 +0000 Subject: [PATCH 2/4] changing how travis build rely on a branch --- .travis.yml | 18 +++++++++--------- build/ci/build.sh | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb0a9a2..36fab91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,27 +10,27 @@ matrix: # PHP5.6 - php: 5.6 - env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.2.x" + env: PHALCON_VERSION="3.2.x" #FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" - php: 5.6 - env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.1.x" + env: PHALCON_VERSION="3.1.x" #FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" - php: 5.6 - env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.0.x" + env: PHALCON_VERSION="3.0.x" #FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" # PHP7.0 - php: 7.0 - env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.2.x" + env: PHALCON_VERSION="3.2.x" #FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" - php: 7.0 - env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.1.x" + env: PHALCON_VERSION="3.1.x" #FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" - php: 7.0 - env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.0.x" + env: PHALCON_VERSION="3.0.x" #FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" # PHP7.1 # - php: 7.1 - # env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.2.x" + # env: PHALCON_VERSION="3.2.x" FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" # - php: 7.1 - # env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.1.x" + # env: PHALCON_VERSION="3.1.x" FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" # - php: 7.1 - # env: FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" PHALCON_VERSION="3.0.x" + # env: PHALCON_VERSION="3.0.x" FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" env: global: diff --git a/build/ci/build.sh b/build/ci/build.sh index 36072a6..bb67be0 100644 --- a/build/ci/build.sh +++ b/build/ci/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # clone slayer -composer create-project phalconslayer/slayer:${SLAYER_VERSION} ~/${SLAYER_FOLDER} +composer create-project phalconslayer/slayer:dev-${TRAVIS_BRANCH} ~/${SLAYER_FOLDER} cd ~/${SLAYER_FOLDER} @@ -19,7 +19,7 @@ cat .env # require framework based on version -composer require phalconslayer/framework:${FRAMEWORK_VERSION} +# composer require phalconslayer/framework:${FRAMEWORK_VERSION} composer require techpivot/phalcon-ci-installer:~1.0 From 3faf20282627b3872071efc7957871db320ee6cc Mon Sep 17 00:00:00 2001 From: Daison Carino Date: Thu, 13 Apr 2017 23:44:46 +0000 Subject: [PATCH 3/4] fixing typo on composer require --- .travis.yml | 18 +++++++++--------- build/ci/build.sh | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 36fab91..11cdf11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,27 +10,27 @@ matrix: # PHP5.6 - php: 5.6 - env: PHALCON_VERSION="3.2.x" #FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" + env: PHALCON_VERSION="3.2.x" SLAYER_VERSION="dev-dev" - php: 5.6 - env: PHALCON_VERSION="3.1.x" #FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" + env: PHALCON_VERSION="3.1.x" SLAYER_VERSION="dev-dev" - php: 5.6 - env: PHALCON_VERSION="3.0.x" #FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" + env: PHALCON_VERSION="3.0.x" SLAYER_VERSION="dev-dev" # PHP7.0 - php: 7.0 - env: PHALCON_VERSION="3.2.x" #FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" + env: PHALCON_VERSION="3.2.x" SLAYER_VERSION="dev-dev" - php: 7.0 - env: PHALCON_VERSION="3.1.x" #FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" + env: PHALCON_VERSION="3.1.x" SLAYER_VERSION="dev-dev" - php: 7.0 - env: PHALCON_VERSION="3.0.x" #FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" + env: PHALCON_VERSION="3.0.x" SLAYER_VERSION="dev-dev" # PHP7.1 # - php: 7.1 - # env: PHALCON_VERSION="3.2.x" FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" + # env: PHALCON_VERSION="3.2.x" SLAYER_VERSION="dev-dev" # - php: 7.1 - # env: PHALCON_VERSION="3.1.x" FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" + # env: PHALCON_VERSION="3.1.x" SLAYER_VERSION="dev-dev" # - php: 7.1 - # env: PHALCON_VERSION="3.0.x" FRAMEWORK_VERSION="1.5.x-dev" SLAYER_VERSION="dev-dev" + # env: PHALCON_VERSION="3.0.x" SLAYER_VERSION="dev-dev" env: global: diff --git a/build/ci/build.sh b/build/ci/build.sh index bb67be0..06f326a 100644 --- a/build/ci/build.sh +++ b/build/ci/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # clone slayer -composer create-project phalconslayer/slayer:dev-${TRAVIS_BRANCH} ~/${SLAYER_FOLDER} +composer create-project phalconslayer/slayer:${SLAYER_VERSION} ~/${SLAYER_FOLDER} cd ~/${SLAYER_FOLDER} @@ -19,7 +19,7 @@ cat .env # require framework based on version -# composer require phalconslayer/framework:${FRAMEWORK_VERSION} +composer require phalconslayer/framework:dev-${TRAVIS_BRANCH} composer require techpivot/phalcon-ci-installer:~1.0 From 47a5642579a98cbb57af8ecf3164d02490549c44 Mon Sep 17 00:00:00 2001 From: Daison Carino Date: Fri, 14 Apr 2017 00:04:46 +0000 Subject: [PATCH 4/4] restoring 0.6.* phinx --- composer.json | 2 +- src/Clarity/Console/App/ControllerCommand.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 57cf6c7..56c7926 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "league/tactician": "^0.6", "mailgun/mailgun-php": "2.2.*", "monolog/monolog": "^1.15", - "robmorgan/phinx": "0.8.*", + "robmorgan/phinx": "0.6.*", "swiftmailer/swiftmailer": "^5.4", "symfony/console": "^2.7", "symfony/debug": "^2.7", diff --git a/src/Clarity/Console/App/ControllerCommand.php b/src/Clarity/Console/App/ControllerCommand.php index 571c892..d92feef 100644 --- a/src/Clarity/Console/App/ControllerCommand.php +++ b/src/Clarity/Console/App/ControllerCommand.php @@ -79,14 +79,15 @@ protected function getNamespace() */ protected function getControllerName($is_path = true) { - $ret = '%s'; + $ret = '%s%s'; if ($is_path) { - $ret = 'Controllers/%sController.php'; + $ret = 'Controllers/%s%s.php'; } return sprintf( $ret, + di()->get('dispatcher')->getControllerSuffix(), studly_case( str_slug($this->input->getArgument('name'), '_') ) @@ -166,6 +167,7 @@ public function slash() $this->info('Crafting Controller...'); $controller = $this->getControllerName(); + # check controller file if exists, throw error if exists if ($app_filesystem->has($module.'/'.$controller)) { $this->error(