Skip to content
This repository was archived by the owner on Apr 25, 2022. It is now read-only.

Commit 67036e8

Browse files
committed
Updated deps
1 parent 1bbd01e commit 67036e8

File tree

8 files changed

+656
-838
lines changed

8 files changed

+656
-838
lines changed

.docker/php/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ RUN composer --version
2828
#RUN "date"
2929

3030
# Install memcached extension
31-
RUN git clone https://github.com/php-memcached-dev/php-memcached /usr/src/php/ext/memcached \
32-
&& cd /usr/src/php/ext/memcached && git checkout -b php7 origin/php7 \
33-
&& docker-php-ext-configure memcached \
34-
&& docker-php-ext-install memcached
31+
#RUN git clone https://github.com/php-memcached-dev/php-memcached /usr/src/php/ext/memcached \
32+
# && cd /usr/src/php/ext/memcached && git checkout -b php7 origin/php7 \
33+
# && docker-php-ext-configure memcached \
34+
# && docker-php-ext-install memcached
3535

3636
# Run docker-php-ext-install for available extensions
3737
RUN docker-php-ext-configure intl \

app/AppKernel.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public function registerBundles()
1616
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
1717
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
1818
new AppBundle\AppBundle(),
19-
new Drgomesp\DockerBundle\DockerBundle(),
2019
];
2120

2221
if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

bin/symfony_requirements

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ echo '> PHP is using the following php.ini file:'.PHP_EOL;
1313
if ($iniPath) {
1414
echo_style('green', ' '.$iniPath);
1515
} else {
16-
echo_style('warning', ' WARNING: No configuration file (php.ini) used by PHP!');
16+
echo_style('yellow', ' WARNING: No configuration file (php.ini) used by PHP!');
1717
}
1818

1919
echo PHP_EOL.PHP_EOL;
@@ -22,7 +22,6 @@ echo '> Checking Symfony requirements:'.PHP_EOL.' ';
2222

2323
$messages = array();
2424
foreach ($symfonyRequirements->getRequirements() as $req) {
25-
/** @var $req Requirement */
2625
if ($helpText = get_error_message($req, $lineSize)) {
2726
echo_style('red', 'E');
2827
$messages['error'][] = $helpText;
@@ -121,10 +120,14 @@ function echo_block($style, $title, $message)
121120

122121
echo PHP_EOL.PHP_EOL;
123122

124-
echo_style($style, str_repeat(' ', $width).PHP_EOL);
125-
echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
126-
echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
127-
echo_style($style, str_repeat(' ', $width).PHP_EOL);
123+
echo_style($style, str_repeat(' ', $width));
124+
echo PHP_EOL;
125+
echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT));
126+
echo PHP_EOL;
127+
echo_style($style, $message);
128+
echo PHP_EOL;
129+
echo_style($style, str_repeat(' ', $width));
130+
echo PHP_EOL;
128131
}
129132

130133
function has_color_support()

composer.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,40 +16,39 @@
1616
"Tests\\": "tests/"
1717
}
1818
},
19-
"minimum-stability": "dev",
19+
"minimum-stability": "stable",
2020
"require": {
21-
"php": ">=5.5.9",
22-
"symfony/symfony": "3.0.*",
21+
"php": ">=7.0",
22+
"symfony/symfony": "3.2.*",
2323
"doctrine/orm": "^2.5",
2424
"doctrine/doctrine-bundle": "^1.6",
2525
"doctrine/doctrine-cache-bundle": "^1.2",
26-
"symfony/swiftmailer-bundle": "^2.3",
27-
"symfony/monolog-bundle": "^2.8",
26+
"symfony/swiftmailer-bundle": "^2.3.10",
27+
"symfony/monolog-bundle": "^3.0.2",
28+
"symfony/polyfill-apcu": "^1.0",
2829
"sensio/distribution-bundle": "^5.0",
2930
"sensio/framework-extra-bundle": "^3.0.2",
3031
"incenteev/composer-parameter-handler": "^2.0",
31-
"drgomesp/docker-bundle": "dev-master@dev"
32+
"twig/twig": "^1.0||^2.0"
3233
},
3334
"require-dev": {
3435
"sensio/generator-bundle": "^3.0",
35-
"symfony/phpunit-bridge": "^2.7"
36+
"symfony/phpunit-bridge": "^3.0"
3637
},
3738
"scripts": {
38-
"post-install-cmd": [
39+
"symfony-scripts": [
3940
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
4041
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
4142
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
4243
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
4344
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
4445
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
4546
],
47+
"post-install-cmd": [
48+
"@symfony-scripts"
49+
],
4650
"post-update-cmd": [
47-
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
48-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
49-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
50-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
51-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
52-
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
51+
"@symfony-scripts"
5352
]
5453
},
5554
"extra": {
@@ -61,6 +60,7 @@
6160
"symfony-assets-install": "relative",
6261
"incenteev-parameters": {
6362
"file": "app/config/parameters.yml"
64-
}
63+
},
64+
"branch-alias": null
6565
}
6666
}

0 commit comments

Comments
 (0)