Skip to content
This repository has been archived by the owner on May 27, 2020. It is now read-only.

Commit

Permalink
[composer] v1.5.0-beta1+demo.v1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Bertrand Dunogier committed Aug 22, 2016
2 parents 8912c8c + b67c30c commit d08780a
Show file tree
Hide file tree
Showing 13 changed files with 137 additions and 108 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ language: generic
services:
- docker

cache:
directories:
- $HOME/.composer/cache/files

env:
global:
- COMPOSE_FILE="doc/docker-compose/base-dev.yml:doc/docker-compose/selenium.yml"
Expand Down
27 changes: 22 additions & 5 deletions app/SymfonyRequirements.php
Original file line number Diff line number Diff line change
Expand Up @@ -425,11 +425,13 @@ public function __construct()
'Change the permissions of either "<strong>app/logs/</strong>" or "<strong>var/logs/</strong>" directory so that the web server can write into it.'
);

$this->addPhpIniRequirement(
'date.timezone', true, false,
'date.timezone setting must be set',
'Set the "<strong>date.timezone</strong>" setting in php.ini<a href="#phpini">*</a> (like Europe/Paris).'
);
if (version_compare($installedPhpVersion, '7.0.0', '<')) {
$this->addPhpIniRequirement(
'date.timezone', true, false,
'date.timezone setting must be set',
'Set the "<strong>date.timezone</strong>" setting in php.ini<a href="#phpini">*</a> (like Europe/Paris).'
);
}

if (version_compare($installedPhpVersion, self::REQUIRED_PHP_VERSION, '>=')) {
$timezones = array();
Expand Down Expand Up @@ -677,6 +679,21 @@ function_exists('posix_isatty'),
'Upgrade your <strong>intl</strong> extension with a newer ICU version (4+).'
);

if (class_exists('Symfony\Component\Intl\Intl')) {
$this->addRecommendation(
\Symfony\Component\Intl\Intl::getIcuDataVersion() <= \Symfony\Component\Intl\Intl::getIcuVersion(),
sprintf('intl ICU version installed on your system is outdated (%s) and does not match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()),
'To get the latest internationalization data upgrade the ICU system package and the intl PHP extension.'
);
if (\Symfony\Component\Intl\Intl::getIcuDataVersion() <= \Symfony\Component\Intl\Intl::getIcuVersion()) {
$this->addRecommendation(
\Symfony\Component\Intl\Intl::getIcuDataVersion() === \Symfony\Component\Intl\Intl::getIcuVersion(),
sprintf('intl ICU version installed on your system (%s) does not match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()),
'To avoid internationalization data incosistencies upgrade the symfony/intl component.'
);
}
}

$this->addPhpIniRecommendation(
'intl.error_level',
create_function('$cfgValue', 'return (int) $cfgValue === 0;'),
Expand Down
8 changes: 4 additions & 4 deletions app/check.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
if ($iniPath) {
echo_style('green', ' '.$iniPath);
} else {
echo_style('warning', ' WARNING: No configuration file (php.ini) used by PHP!');
echo_style('yellow', ' WARNING: No configuration file (php.ini) used by PHP!');
}

echo PHP_EOL.PHP_EOL;
Expand Down Expand Up @@ -80,7 +80,7 @@ function get_error_message(Requirement $requirement, $lineSize)
return;
}

$errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL;
$errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL;
$errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL;

return $errorMessage;
Expand Down Expand Up @@ -121,8 +121,8 @@ function echo_block($style, $title, $message)
echo PHP_EOL.PHP_EOL;

echo_style($style, str_repeat(' ', $width).PHP_EOL);
echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
echo_style($style, str_repeat(' ', $width).PHP_EOL);
}

Expand Down
4 changes: 0 additions & 4 deletions app/config/routing_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ _profiler:
resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
prefix: /_profiler

_configurator:
resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
prefix: /_configurator

# Symfony 2.6
_errors:
resource: "@TwigBundle/Resources/config/routing/errors.xml"
Expand Down
6 changes: 4 additions & 2 deletions app/phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="bootstrap.php.cache"
bootstrap="autoload.php"
>

<php>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>
<testsuite name="Project Test Suite">
<directory>../src/*/*Bundle/Tests</directory>
Expand Down
2 changes: 1 addition & 1 deletion behat.yml.dist
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file contains the default configuration for behat testing using EzSystems/BehatBundle
default:
calls:
error_reporting: 14335 # E_ALL & ~E_USER_DEPRECATED
error_reporting: -1 # Report all PHP errors
extensions:
Behat\MinkExtension:
base_url: 'http://localhost'
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@
"symfony/assetic-bundle": "~2.3",
"symfony/swiftmailer-bundle": "~2.3",
"symfony/monolog-bundle": "~2.4",
"sensio/distribution-bundle": "~3.0",
"sensio/distribution-bundle": "^5.0",
"sensio/generator-bundle": "~2.3",
"incenteev/composer-parameter-handler": "~2.0",
"tedivm/stash-bundle": "~0.4",
"ezsystems/ezpublish-kernel": "^6.5@dev",
"ezsystems/repository-forms": "^1.3@dev",
"ezsystems/ezplatform-solr-search-engine": "^1.1@dev",
"ezsystems/platform-ui-bundle": "^1.5@dev",
"ezsystems/platform-ui-assets-bundle": "@alpha",
"ezsystems/ez-support-tools": "~0.1.0@dev",
"ezsystems/ezpublish-kernel": "^6.5@beta",
"ezsystems/repository-forms": "^1.4@beta",
"ezsystems/ezplatform-solr-search-engine": "^1.0",
"ezsystems/platform-ui-bundle": "^1.5@beta",
"ezsystems/platform-ui-assets-bundle": "@beta",
"ezsystems/ez-support-tools": "~0.1.0",
"egulias/listeners-debug-command-bundle": "~1.9",
"white-october/pagerfanta-bundle": "1.0.*",
"hautelook/templated-uri-bundle": "~1.0 | ~2.0",
Expand Down
Loading

0 comments on commit d08780a

Please sign in to comment.