deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

New composer

Browse source
This commit is contained in:
aliaxander 2016-02-19 18:32:31 +03:00
parent 998afcc33b
commit 4624e0ce02
3 changed files with 527 additions and 343 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PHPCI/Application.php
View file

@ -104,7 +104,7 @@ class Application extends b8\Application
$this->response->setContent($view->render()); $this->response->setContent($view->render());
} }
if ($this->response->hasLayout() && $this->controller->layout) { if (!empty($this->response->hasLayout()) && isset($this->controller->layout)) {
$this->setLayoutVariables($this->controller->layout); $this->setLayoutVariables($this->controller->layout);
$this->controller->layout->content = $this->response->getContent(); $this->controller->layout->content = $this->response->getContent();

12
composer.json
View file

@ -57,20 +57,20 @@
"require": { "require": {
"php": ">=5.3.8", "php": ">=5.3.8",
"ext-pdo": "*", "ext-pdo": "*",
"ox/b8framework": "@dev", "block8/b8framework": "@dev",
"ircmaxell/password-compat": "1.0.*", "ircmaxell/password-compat": "1.0.*",
"swiftmailer/swiftmailer": "5.4.*", "swiftmailer/swiftmailer": "5.4.*",
"symfony/yaml": "3.0.*", "symfony/yaml": "~2.1",
"symfony/console": "3.0.*", "symfony/console": "~2.1",
"psr/log": "1.0.*", "psr/log": "1.0.*",
"monolog/monolog": "1.17.*", "monolog/monolog": "1.17.*",
"pimple/pimple": "3.0.*", "pimple/pimple": "~2.0",
"robmorgan/phinx": "0.5.*", "robmorgan/phinx": "0.5.*",
"sensiolabs/ansi-to-html": "1.1.*", "sensiolabs/ansi-to-html": "1.1.*",
"pda/pheanstalk": "3.1.*", "pda/pheanstalk": "3.1.*",
"maknz/slack": "1.7.*", "maknz/slack": "1.7.*",
"hipchat/hipchat-php": "1.*", "hipchat/hipchat-php": "1.*",
"ox/flowdock": "@dev" "mremi/flowdock": "@dev"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "5.2.*", "phpunit/phpunit": "5.2.*",
@ -93,4 +93,4 @@
"behat/behat": "Behat BDD Testing", "behat/behat": "Behat BDD Testing",
"phptal/phptal": "PHPTAL templating engine" "phptal/phptal": "PHPTAL templating engine"
} }
} }

856
composer.lock generated
View file

File diff suppressed because it is too large Load diff