Skip to content
This repository was archived by the owner on Nov 19, 2020. It is now read-only.

Package update #26

Merged
daison12006013 merged 5 commits into from
Apr 14, 2017
Merged

Package update #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd25678
updating packages version
Apr 13, 2017
1c713f7
Merge branch 'master' into package-update
Apr 13, 2017
bdd3f93
changing how travis build rely on a branch
Apr 13, 2017
3faf202
fixing typo on composer require
Apr 13, 2017
47a5642
restoring 0.6.* phinx
Apr 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" 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" 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" 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" 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" 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" 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" 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" 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" SLAYER_VERSION="dev-dev"

env:
global:
Expand Down
2 changes: 1 addition & 1 deletion build/ci/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.*",
"swiftmailer/swiftmailer": "^5.4",
"symfony/console": "^2.7",
"symfony/debug": "^2.7",
Expand Down
6 changes: 4 additions & 2 deletions src/Clarity/Console/App/ControllerCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'), '_')
)
Expand Down Expand Up @@ -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(
Expand Down