diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.7' 

* 2.7:
  [PhpUnitBridge] new bridge for testing with PHPUnit
  [FrameworkBundle] Check if templating is enabled.
  [Filesystem] Improve exception message for copy method
  [FrameworkBundle] Made ServerParams a service
  [2.7] [FrameworkBundle] bugfix in configuration for assets
  [FrameworkBundle] Enable assets by default.
  [Form] OptionsResolver 3.0 is not BC anymore
  [TwigBundle] add missing asset dependency
  Add an auto_alias compiler pass

Conflicts:
	.travis.yml
	composer.json
	src/Symfony/Bridge/Doctrine/composer.json
	src/Symfony/Bridge/Monolog/composer.json
	src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
	src/Symfony/Bridge/ProxyManager/composer.json
	src/Symfony/Bridge/Swiftmailer/composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/DebugBundle/composer.json
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Bundle/WebProfilerBundle/composer.json
	src/Symfony/Component/BrowserKit/composer.json
	src/Symfony/Component/ClassLoader/composer.json
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/DependencyInjection/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Intl/composer.json
	src/Symfony/Component/Routing/composer.json
	src/Symfony/Component/Security/Core/composer.json
	src/Symfony/Component/Security/Csrf/composer.json
	src/Symfony/Component/Security/Http/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Serializer/composer.json
	src/Symfony/Component/Translation/composer.json
	src/Symfony/Component/Validator/composer.json
This commit is contained in:
Nicolas Grekas 2015-02-21 14:23:59 +01:00
parent 22cd78c4a8 9a4f3e134b
commit 3410aa6630
104 changed files with 553 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -6,7 +6,7 @@ matrix:
- php: 5.5
- php: 5.6
- php: 5.5.9
env: components=low
env: components=low SYMFONY_DEPRECATIONS_HELPER=weak
- php: 5.6
env: components=high
- php: hhvm-nightly
@ -19,6 +19,7 @@ services: mongodb
env:
global:
- components=no
- SYMFONY_DEPRECATIONS_HELPER=strict
before_install:
- travis_retry sudo apt-get install parallel
@ -39,5 +40,5 @@ install:
script:
- if [ "$components" = "no" ]; then ls -d src/Symfony/*/* | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; phpunit --exclude-group tty,benchmark,intl-data {} || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
- if [ "$components" = "no" ]; then echo -e "\\nRunning tests requiring tty"; phpunit --group tty || (echo -e "\\e[41mKO\\e[0m tty group" && $(exit 1)); fi;
- if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
- if [ "$components" = "high" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; phpunit --exclude-group tty,benchmark,intl-data,legacy || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;
- if [ "$components" = "low" ]; then find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist | sed 's#\(.*\)/.*#\1#' | parallel --gnu --keep-order -j25% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; phpunit --exclude-group tty,benchmark,intl-data || (echo -e "\\e[41mKO\\e[0m {}" && $(exit 1));'; fi;

4
composer.json
View File

@ -45,6 +45,7 @@
"symfony/locale": "self.version",
"symfony/monolog-bridge": "self.version",
"symfony/options-resolver": "self.version",
"symfony/phpunit-bridge": "self.version",
"symfony/process": "2.99.99",
"symfony/property-access": "self.version",
"symfony/proxy-manager-bridge": "self.version",
@ -84,6 +85,9 @@
],
"files": [ "src/Symfony/Component/Intl/Resources/stubs/functions.php" ]
},
"autoload-dev": {
"files": [ "src/Symfony/Bridge/PhpUnit/bootstrap.php" ]
},
"minimum-stability": "dev",
"extra": {
"branch-alias": {

13
phpunit.xml.dist
View File

@ -4,16 +4,13 @@
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="autoload.php.dist"
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="intl.default_locale" value="en"/>
<ini name="intl.error_level" value="0"/>
<ini name="memory_limit" value="-1"/>
<ini name="error_reporting" value="-1" />
<ini name="intl.default_locale" value="en" />
<ini name="intl.error_level" value="0" />
<ini name="memory_limit" value="-1" />
</php>
<testsuites>

14
src/Symfony/Bridge/Doctrine/Tests/bootstrap.php
View File

@ -1,14 +0,0 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
$loader = require __DIR__.'/../vendor/autoload.php';
Doctrine\Common\Annotations\AnnotationRegistry::registerLoader(array($loader, 'loadClass'));

1
src/Symfony/Bridge/Doctrine/composer.json
View File

@ -20,6 +20,7 @@
"doctrine/common": "~2.3"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/stopwatch": "~2.7|~3.0",
"symfony/dependency-injection": "~2.7|~3.0",
"symfony/form": "~2.7|~3.0",

6
src/Symfony/Bridge/Doctrine/phpunit.xml.dist
View File

@ -4,12 +4,10 @@
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="Tests/bootstrap.php"
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Bridge/Monolog/composer.json
View File

@ -20,6 +20,7 @@
"monolog/monolog": "~1.11"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/http-kernel": "~2.7|~3.0",
"symfony/console": "~2.7|~3.0",
"symfony/event-dispatcher": "~2.7|~3.0"

4
src/Symfony/Bridge/Monolog/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

3
src/Symfony/Bridge/PhpUnit/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
vendor/
composer.lock
phpunit.xml

111
autoload.php.dist → src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
View File

@ -1,21 +1,26 @@
<?php
// Disabling Zend Garbage Collection to prevent segfaults
// https://bugs.php.net/bug.php?id=53976
if (gc_enabled()) {
gc_disable();
}
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Bridge\PhpUnit;
/**
* Catch deprecation notices and print a summary report at the end of the test suite
*
* @internal
* @author Nicolas Grekas <p@tchwork.com>
*/
class DeprecationErrorHandler
{
private static $isRegistered = false;
public static function register()
public static function register($strict = false)
{
if (self::$isRegistered) {
return;
@ -28,9 +33,9 @@ class DeprecationErrorHandler
'legacy' => array(),
'other' => array(),
);
$deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations) {
$deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations, $strict) {
if (E_USER_DEPRECATED !== $type) {
return PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);
return \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);
}
$trace = debug_backtrace(PHP_VERSION_ID >= 50400 ? DEBUG_BACKTRACE_IGNORE_ARGS | DEBUG_BACKTRACE_PROVIDE_OBJECT : true);
@ -44,19 +49,38 @@ class DeprecationErrorHandler
$class = isset($trace[$i]['object']) ? get_class($trace[$i]['object']) : $trace[$i]['class'];
$method = $trace[$i]['function'];
$type = 0 === strpos($method, 'testLegacy') || 0 === strpos($method, 'provideLegacy') || 0 === strpos($method, 'getLegacy') || strpos($class, '\Legacy') ? 'legacy' : 'remaining';
$group = 0 === strpos($method, 'testLegacy') || 0 === strpos($method, 'provideLegacy') || 0 === strpos($method, 'getLegacy') || strpos($class, '\Legacy') || in_array('legacy', \PHPUnit_Util_Test::getGroups($class, $method), true) ? 'legacy' : 'remaining';
if ('legacy' === $type && 0 === (error_reporting() & E_USER_DEPRECATED)) {
@++$deprecations[$type]['Silenced']['count'];
if ('legacy' === $group && 0 === (error_reporting() & E_USER_DEPRECATED)) {
$ref =& $deprecations[$group]['Silenced']['count'];
++$ref;
} else {
@++$deprecations[$type][$msg]['count'];
@++$deprecations[$type][$msg][$class.'::'.$method];
$ref =& $deprecations[$group][$msg]['count'];
++$ref;
$ref =& $deprecations[$group][$msg][$class.'::'.$method];
++$ref;
}
} else {
$type = 'other';
@++$deprecations[$type][$msg]['count'];
$group = 'other';
$ref =& $deprecations[$group][$msg]['count'];
++$ref;
}
++$deprecations[$group.'Count'];
unset($trace, $ref);
if ('legacy' !== $group) {
try {
$e = $strict ? error_reporting(-1) : error_reporting();
$result = \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);
error_reporting($e);
} catch (\Exception $x) {
error_reporting($e);
throw $x;
}
return $result;
}
++$deprecations[$type.'Count'];
};
$oldErrorHandler = set_error_handler($deprecationHandler);
@ -68,20 +92,16 @@ class DeprecationErrorHandler
}
} else {
self::$isRegistered = true;
register_shutdown_function(function () use (&$deprecations, $deprecationHandler) {
$colorize = new \SebastianBergmann\Environment\Console();
if ($colorize->hasColorSupport()) {
$colorize = function ($str, $red) {
$color = $red ? '41;37' : '43;30';
return "\x1B[{$color}m{$str}\x1B[0m";
};
} else {
$colorize = function ($str) {return $str;};
}
if (self::hasColorSupport()) {
$colorize = function ($str, $red) {
$color = $red ? '41;37' : '43;30';
return "\x1B[{$color}m{$str}\x1B[0m";
};
} else {
$colorize = function ($str) {return $str;};
}
register_shutdown_function(function () use (&$deprecations, $deprecationHandler, $colorize) {
$currErrorHandler = set_error_handler('var_dump');
restore_error_handler();
@ -93,13 +113,13 @@ class DeprecationErrorHandler
return $b['count'] - $a['count'];
};
foreach (array('remaining', 'legacy', 'other') as $type) {
if ($deprecations[$type]) {
echo "\n", $colorize(sprintf('%s deprecation notices (%d)', ucfirst($type), $deprecations[$type.'Count']), 'legacy' !== $type), "\n";
foreach (array('remaining', 'legacy', 'other') as $group) {
if ($deprecations[$group]) {
echo "\n", $colorize(sprintf('%s deprecation notices (%d)', ucfirst($group), $deprecations[$group.'Count']), 'legacy' !== $group), "\n";
uasort($deprecations[$type], $cmp);
uasort($deprecations[$group], $cmp);
foreach ($deprecations[$type] as $msg => $notices) {
foreach ($deprecations[$group] as $msg => $notices) {
echo "\n", $msg, ': ', $notices['count'], "x\n";
arsort($notices);
@ -118,16 +138,13 @@ class DeprecationErrorHandler
});
}
}
private static function hasColorSupport()
{
if ('\\' === DIRECTORY_SEPARATOR) {
return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI');
}
return defined('STDOUT') && function_exists('posix_isatty') && @posix_isatty(STDOUT);
}
}
if (class_exists('PHPUnit_Util_ErrorHandler')) {
DeprecationErrorHandler::register();
}
$loader = require_once __DIR__.'/vendor/autoload.php';
use Doctrine\Common\Annotations\AnnotationRegistry;
AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
return $loader;

19
src/Symfony/Bridge/PhpUnit/LICENSE Normal file
View File

@ -0,0 +1,19 @@
Copyright (c) 2014-2015 Fabien Potencier
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

62
src/Symfony/Bridge/PhpUnit/README.md Normal file
View File

@ -0,0 +1,62 @@
PHPUnit Bridge
==============
Provides utilities for PHPUnit, especially user deprecation notices management.
It comes with the following features:
* disable the garbage collector;
* auto-register `class_exists` to load Doctrine annotations;
* print a user deprecation notices summary at the end of the test suite.
Handling user deprecation notices is sensitive to the SYMFONY_DEPRECATIONS_HELPER
environment variable. This env var configures 3 behaviors depending on its value:
* when set to `strict`, all but legacy-tagged deprecation notices will make tests
fail. This is the recommended mode for best forward compatibility.
* `weak` on the contrary will make tests ignore all deprecation notices.
This is the recommended mode for legacy projects that must use deprecated
interfaces for backward compatibility reasons.
* any other value will respect the current error reporting level.
All three modes will display a summary of deprecation notices at the end of the
test suite, split in two groups:
* **Legacy** deprecation notices denote tests that explicitly test some legacy
interfaces. In all 3 modes, deprecation notices triggered in a legacy-tagged
test do never make a test fail. There are four ways to mark a test as legacy:
- make its class start with the `Legacy` prefix;
- make its method start with `testLegacy`;
- make its data provider start with `provideLegacy` or `getLegacy`;
- add the `@group legacy` annotation to its class or method.
* **Remaining/Other** deprecation notices are all other (non-legacy)
notices, grouped by message, test class and method.
Usage
-----
Add this bridge to the `require-dev` section of your composer.json file
(not in `require`) with e.g.
`composer require --dev "symfony/phpunit-bridge"`.
When running `phpunit`, you will see a summary of deprecation notices at the end
of the test suite.
Deprecation notices in the **Remaining/Other** section need some thought.
You have to decide either to:
* update your code to not use deprecated interfaces anymore, thus gaining better
forward compatibility;
* or move them to the **Legacy** section (by using one of the above way).
After reviewing them, you should silence deprecations in the **Legacy** section
if you think they are triggered by tests dedicated to testing deprecated
interfaces. To do so, add the following line at the beginning of your legacy
test case or in the `setUp()` method of your legacy test class:
`$this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);`
Last but not least, you should then configure your C.I. to the reporting mode
that is appropriated to your project by setting SYMFONY_DEPRECATIONS_HELPER to
`strict`, `weak` or empty. It is recommended to start with `weak` mode, upgrade
your code as described above, then when the *Remaining/Other* sections are empty,
move to `strict` to keep forward compatibility on the long run.

29
src/Symfony/Bridge/PhpUnit/bootstrap.php Normal file
View File

@ -0,0 +1,29 @@
<?php
use Doctrine\Common\Annotations\AnnotationRegistry;
use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
if (!class_exists('PHPUnit_Util_ErrorHandler')) {
return;
}
// Disabling Zend Garbage Collection to prevent segfaults with PHP5.4+
// https://bugs.php.net/bug.php?id=53976
gc_disable();
if (class_exists('Doctrine\Common\Annotations\AnnotationRegistry')) {
AnnotationRegistry::registerLoader('class_exists');
}
switch (getenv('SYMFONY_DEPRECATIONS_HELPER')) {
case 'strict':
DeprecationErrorHandler::register(true);
break;
case 'weak':
error_reporting(error_reporting() & ~E_USER_DEPRECATED);
// No break;
default:
DeprecationErrorHandler::register(false);
break;
}

32
src/Symfony/Bridge/PhpUnit/composer.json Normal file
View File

@ -0,0 +1,32 @@
{
"name": "symfony/phpunit-bridge",
"type": "symfony-bridge",
"description": "Symfony PHPUnit Bridge",
"keywords": [],
"homepage": "http://symfony.com",
"license": "MIT",
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
}
],
"require": {
"php": ">=5.5.9"
},
"autoload": {
"files": [ "bootstrap.php" ],
"psr-0": { "Symfony\\Bridge\\PhpUnit\\": "" }
},
"target-dir": "Symfony/Bridge/PhpUnit",
"minimum-stability": "dev",
"extra": {
"branch-alias": {
"dev-master": "3.0-dev"
}
}
}

28
src/Symfony/Bridge/PhpUnit/phpunit.xml.dist Normal file
View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="vendor/autoload.php"
>
<php>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>
<testsuite name="Symfony PHPUnit Bridge Test Suite">
<directory>./Tests/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory>./</directory>
<exclude>
<directory>./Tests</directory>
<directory>./vendor</directory>
</exclude>
</whitelist>
</filter>
</phpunit>

1
src/Symfony/Bridge/ProxyManager/composer.json
View File

@ -21,6 +21,7 @@
"ocramius/proxy-manager": "~0.4|~1.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/config": "~2.7|~3.0"
},
"autoload": {

4
src/Symfony/Bridge/ProxyManager/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Bridge/Twig/composer.json
View File

@ -20,6 +20,7 @@
"twig/twig": "~1.18"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/finder": "~2.7|~3.0",
"symfony/form": "~2.7|~3.0",
"symfony/http-kernel": "~2.7|~3.0",

4
src/Symfony/Bridge/Twig/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Bundle/DebugBundle/composer.json
View File

@ -22,6 +22,7 @@
"symfony/var-dumper": "~2.7|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/config": "~2.7|~3.0",
"symfony/dependency-injection": "~2.7|~3.0"
},

4
src/Symfony/Bundle/DebugBundle/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

8
src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
View File

@ -154,7 +154,13 @@
</service>
<!-- HttpFoundationRequestHandler -->
<service id="form.type_extension.form.request_handler" class="%form.type_extension.form.request_handler.class%" public="false" />
<service id="form.type_extension.form.request_handler" class="%form.type_extension.form.request_handler.class%" public="false">
<argument type="service" id="form.server_params" />
</service>
<service id="form.server_params" class="Symfony\Component\Form\Util\ServerParams" public="false">
<argument type="service" id="request_stack" />
</service>
<!-- FormTypeValidatorExtension -->
<service id="form.type_extension.form.validator" class="Symfony\Component\Form\Extension\Validator\Type\FormTypeValidatorExtension">

26
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
View File

@ -86,6 +86,25 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
));
}
/**
* @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
* @expectedExceptionMessage You cannot use assets settings under "framework.templating" and "assets" configurations in the same project.
*/
public function testInvalidValueAssets()
{
$processor = new Processor();
$configuration = new Configuration(true);
$processor->processConfiguration($configuration, array(
array(
'templating' => array(
'engines' => null,
'assets_base_urls' => '//example.com',
),
'assets' => null,
),
));
}
protected static function getBundleDefaultConfig()
{
return array(
@ -145,6 +164,13 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
'magic_call' => false,
'throw_exception_on_invalid_index' => false,
),
'assets' => array(
'version' => null,
'version_format' => '%%s?%%s',
'base_path' => '',
'base_urls' => array(),
'packages' => array(),
),
);
}
}

3
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -17,6 +17,7 @@
],
"require": {
"php": ">=5.5.9",
"symfony/asset": "~2.7|~3.0",
"symfony/dependency-injection" : "~2.7|~3.0",
"symfony/config" : "~2.7|~3.0",
"symfony/event-dispatcher": "~2.7|~3.0",
@ -32,6 +33,7 @@
"doctrine/annotations": "~1.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/browser-kit": "~2.7|~3.0",
"symfony/console": "~2.7|~3.0",
"symfony/css-selector": "~2.7|~3.0",
@ -47,7 +49,6 @@
"symfony/yaml": "~2.7|~3.0"
},
"suggest": {
"symfony/asset": "",
"symfony/console": "For using the console commands",
"symfony/finder": "For using the translation loader and cache warmer",
"symfony/form": "For using forms",

4
src/Symfony/Bundle/FrameworkBundle/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Bundle/SecurityBundle/composer.json
View File

@ -21,6 +21,7 @@
"symfony/http-kernel": "~2.7|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/browser-kit": "~2.7|~3.0",
"symfony/console": "~2.7|~3.0",
"symfony/css-selector": "~2.7|~3.0",

4
src/Symfony/Bundle/SecurityBundle/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

2
src/Symfony/Bundle/TwigBundle/composer.json
View File

@ -17,11 +17,13 @@
],
"require": {
"php": ">=5.5.9",
"symfony/asset": "~2.7|~3.0",
"symfony/twig-bridge": "~2.7|~3.0",
"symfony/http-foundation": "~2.7|~3.0",
"symfony/http-kernel": "~2.7|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/stopwatch": "~2.7|~3.0",
"symfony/dependency-injection": "~2.7|~3.0",
"symfony/expression-language": "~2.7|~3.0",

4
src/Symfony/Bundle/TwigBundle/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Bundle/WebProfilerBundle/composer.json
View File

@ -22,6 +22,7 @@
"symfony/twig-bridge": "~2.7|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/config": "~2.7|~3.0",
"symfony/console": "~2.7|~3.0",
"symfony/dependency-injection": "~2.7|~3.0",

4
src/Symfony/Bundle/WebProfilerBundle/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

5
src/Symfony/Component/Asset/composer.json
View File

@ -22,7 +22,8 @@
"symfony/http-foundation": ""
},
"require-dev": {
"symfony/http-foundation": "~2.4"
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/http-foundation": "~2.7|~3.0"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Asset\\": "" }
@ -30,7 +31,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
"dev-master": "2.7-dev"
"dev-master": "3.0-dev"
}
}
}

4
src/Symfony/Component/Asset/phpunit.xml.dist
View File

@ -6,6 +6,10 @@
colors="true"
bootstrap="vendor/autoload.php"
>
<php>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>
<testsuite name="Symfony Asset Component Test Suite">
<directory>./Tests/</directory>

1
src/Symfony/Component/BrowserKit/composer.json
View File

@ -20,6 +20,7 @@
"symfony/dom-crawler": "~2.7|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/process": "~2.7|~3.0",
"symfony/css-selector": "~2.7|~3.0"
},

4
src/Symfony/Component/BrowserKit/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/ClassLoader/composer.json
View File

@ -20,6 +20,7 @@
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/finder": "~2.7|~3.0"
},
"autoload": {

4
src/Symfony/Component/ClassLoader/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

3
src/Symfony/Component/Config/composer.json
View File

@ -19,6 +19,9 @@
"php": ">=5.5.9",
"symfony/filesystem": "~2.7|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"autoload": {
"psr-0": { "Symfony\\Component\\Config\\": "" }
},

4
src/Symfony/Component/Config/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/Console/composer.json
View File

@ -19,6 +19,7 @@
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/event-dispatcher": "~2.7|~3.0",
"symfony/process": "~2.7|~3.0",
"psr/log": "~1.0"

4
src/Symfony/Component/Console/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

3
src/Symfony/Component/CssSelector/composer.json
View File

@ -22,6 +22,9 @@
"require": {
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"autoload": {
"psr-0": { "Symfony\\Component\\CssSelector\\": "" }
},

4
src/Symfony/Component/CssSelector/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/Debug/composer.json
View File

@ -23,6 +23,7 @@
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/class-loader": "~2.7|~3.0",
"symfony/http-kernel": "~2.7|~3.0",
"symfony/http-foundation": "~2.7|~3.0"

4
src/Symfony/Component/Debug/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

41
src/Symfony/Component/DependencyInjection/Compiler/AutoAliasServicePass.php Normal file
View File

@ -0,0 +1,41 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Component\DependencyInjection\Compiler;
use Symfony\Component\DependencyInjection\Alias;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
/**
* Sets a service to be an alias of another one, given a format pattern.
*/
class AutoAliasServicePass implements CompilerPassInterface
{
/**
* {@inheritdoc}
*/
public function process(ContainerBuilder $container)
{
foreach ($container->findTaggedServiceIds('auto_alias') as $serviceId => $tags) {
foreach ($tags as $tag) {
if (!isset($tag['format'])) {
throw new InvalidArgumentException(sprintf('Missing tag information "format" on auto_alias service "%s".', $serviceId));
}
$aliasId = $container->getParameterBag()->resolveValue($tag['format']);
if ($container->hasDefinition($aliasId) || $container->hasAlias($aliasId)) {
$container->setAlias($serviceId, new Alias($aliasId));
}
}
}
}
}

103
src/Symfony/Component/DependencyInjection/Tests/Compiler/AutoAliasServicePassTest.php Normal file
View File

@ -0,0 +1,103 @@
<?php
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
use Symfony\Component\DependencyInjection\Compiler\AutoAliasServicePass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
class AutoAliasServicePassTest extends \PHPUnit_Framework_TestCase
{
/**
* @expectedException \Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException
*/
public function testProcessWithMissingParameter()
{
$container = new ContainerBuilder();
$container->register('example')
->addTag('auto_alias', array('format' => '%non_existing%.example'));
$pass = new AutoAliasServicePass();
$pass->process($container);
}
/**
* @expectedException \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException
*/
public function testProcessWithMissingFormat()
{
$container = new ContainerBuilder();
$container->register('example')
->addTag('auto_alias', array());
$container->setParameter('existing', 'mysql');
$pass = new AutoAliasServicePass();
$pass->process($container);
}
public function testProcessWithNonExistingAlias()
{
$container = new ContainerBuilder();
$container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
->addTag('auto_alias', array('format' => '%existing%.example'));
$container->setParameter('existing', 'mysql');
$pass = new AutoAliasServicePass();
$pass->process($container);
$this->assertEquals('Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault', $container->getDefinition('example')->getClass());
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault', $container->get('example'));
}
public function testProcessWithExistingAlias()
{
$container = new ContainerBuilder();
$container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
->addTag('auto_alias', array('format' => '%existing%.example'));
$container->register('mysql.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMysql');
$container->setParameter('existing', 'mysql');
$pass = new AutoAliasServicePass();
$pass->process($container);
$this->assertTrue($container->hasAlias('example'));
$this->assertEquals('mysql.example', $container->getAlias('example'));
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMysql', $container->get('example'));
}
public function testProcessWithManualAlias()
{
$container = new ContainerBuilder();
$container->register('example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassDefault')
->addTag('auto_alias', array('format' => '%existing%.example'));
$container->register('mysql.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMysql');
$container->register('mariadb.example', 'Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMariadb');
$container->setAlias('example', 'mariadb.example');
$container->setParameter('existing', 'mysql');
$pass = new AutoAliasServicePass();
$pass->process($container);
$this->assertTrue($container->hasAlias('example'));
$this->assertEquals('mariadb.example', $container->getAlias('example'));
$this->assertInstanceOf('Symfony\Component\DependencyInjection\Tests\Compiler\ServiceClassMariaDb', $container->get('example'));
}
}
class ServiceClassDefault
{
}
class ServiceClassMysql extends ServiceClassDefault
{
}
class ServiceClassMariaDb extends ServiceClassMysql
{
}

4
src/Symfony/Component/DependencyInjection/composer.json
View File

@ -19,13 +19,11 @@
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/yaml": "~2.7|~3.0",
"symfony/config": "~2.7|~3.0",
"symfony/expression-language": "~2.7|~3.0"
},
"conflict": {
"symfony/expression-language": "<2.6"
},
"suggest": {
"symfony/yaml": "",
"symfony/config": "",

4
src/Symfony/Component/DependencyInjection/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/DomCrawler/composer.json
View File

@ -19,6 +19,7 @@
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/css-selector": "~2.7|~3.0"
},
"suggest": {

4
src/Symfony/Component/DomCrawler/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/EventDispatcher/composer.json
View File

@ -19,6 +19,7 @@
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/dependency-injection": "~2.7|~3.0",
"symfony/expression-language": "~2.7|~3.0",
"symfony/config": "~2.7|~3.0",

4
src/Symfony/Component/EventDispatcher/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

3
src/Symfony/Component/ExpressionLanguage/composer.json
View File

@ -18,6 +18,9 @@
"require": {
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"autoload": {
"psr-0": { "Symfony\\Component\\ExpressionLanguage\\": "" }
},

4
src/Symfony/Component/ExpressionLanguage/phpunit.xml.dist
View File

@ -12,9 +12,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

4
src/Symfony/Component/Filesystem/Filesystem.php
View File

@ -72,8 +72,8 @@ class Filesystem
// Like `cp`, preserve executable permission bits
@chmod($targetFile, fileperms($targetFile) | (fileperms($originFile) & 0111));
if (stream_is_local($originFile) && $bytesCopied !== filesize($originFile)) {
throw new IOException(sprintf('Failed to copy the whole content of "%s" to "%s %g bytes copied".', $originFile, $targetFile, $bytesCopied), 0, null, $originFile);
if (stream_is_local($originFile) && $bytesCopied !== ($bytesOrigin = filesize($originFile))) {
throw new IOException(sprintf('Failed to copy the whole content of "%s" to "%s" (%g of %g bytes copied).', $originFile, $targetFile, $bytesCopied, $bytesOrigin), 0, null, $originFile);
}
}
}

3
src/Symfony/Component/Filesystem/composer.json
View File

@ -18,6 +18,9 @@
"require": {
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"autoload": {
"psr-0": { "Symfony\\Component\\Filesystem\\": "" }
},

4
src/Symfony/Component/Filesystem/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

3
src/Symfony/Component/Finder/composer.json
View File

@ -18,6 +18,9 @@
"require": {
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"autoload": {
"psr-0": { "Symfony\\Component\\Finder\\": "" }
},

4
src/Symfony/Component/Finder/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/Form/composer.json
View File

@ -23,6 +23,7 @@
"symfony/property-access": "~2.7|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"doctrine/collections": "~1.0",
"symfony/validator": "~2.7|~3.0",
"symfony/http-foundation": "~2.7|~3.0",

4
src/Symfony/Component/Form/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/HttpFoundation/composer.json
View File

@ -19,6 +19,7 @@
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/expression-language": "~2.7|~3.0"
},
"autoload": {

4
src/Symfony/Component/HttpFoundation/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/HttpKernel/composer.json
View File

@ -23,6 +23,7 @@
"psr/log": "~1.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/browser-kit": "~2.7|~3.0",
"symfony/class-loader": "~2.7|~3.0",
"symfony/config": "~2.7|~3.0",

4
src/Symfony/Component/HttpKernel/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/Intl/composer.json
View File

@ -27,6 +27,7 @@
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/filesystem": "~2.7|~3.0"
},
"suggest": {

4
src/Symfony/Component/Intl/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

3
src/Symfony/Component/Locale/composer.json
View File

@ -19,6 +19,9 @@
"php": ">=5.5.9",
"symfony/intl": "~2.7|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"autoload": {
"psr-0": { "Symfony\\Component\\Locale\\": "" }
},

4
src/Symfony/Component/Locale/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

3
src/Symfony/Component/OptionsResolver/composer.json
View File

@ -18,6 +18,9 @@
"require": {
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"autoload": {
"psr-0": { "Symfony\\Component\\OptionsResolver\\": "" }
},

4
src/Symfony/Component/OptionsResolver/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

3
src/Symfony/Component/Process/composer.json
View File

@ -18,6 +18,9 @@
"require": {
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"autoload": {
"psr-0": { "Symfony\\Component\\Process\\": "" }
},

4
src/Symfony/Component/Process/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

3
src/Symfony/Component/PropertyAccess/composer.json
View File

@ -18,6 +18,9 @@
"require": {
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"autoload": {
"psr-0": { "Symfony\\Component\\PropertyAccess\\": "" }
},

4
src/Symfony/Component/PropertyAccess/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/Routing/composer.json
View File

@ -19,6 +19,7 @@
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/config": "~2.7|~3.0",
"symfony/http-foundation": "~2.7|~3.0",
"symfony/yaml": "~2.7|~3.0",

4
src/Symfony/Component/Routing/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/Security/Acl/composer.json
View File

@ -20,6 +20,7 @@
"symfony/security-core": "~2.7|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"doctrine/common": "~2.2",
"doctrine/dbal": "~2.2",
"psr/log": "~1.0"

4
src/Symfony/Component/Security/Acl/phpunit.xml.dist
View File

@ -12,9 +12,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/Security/Core/composer.json
View File

@ -19,6 +19,7 @@
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/event-dispatcher": "~2.7|~3.0",
"symfony/expression-language": "~2.7|~3.0",
"symfony/http-foundation": "~2.7|~3.0",

4
src/Symfony/Component/Security/Core/phpunit.xml.dist
View File

@ -12,9 +12,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

5
src/Symfony/Component/Security/Csrf/composer.json
View File

@ -16,10 +16,11 @@
}
],
"require": {
"php": ">=5.3.9",
"symfony/security-core": "~2.4|~3.0.0"
"php": ">=5.5.9",
"symfony/security-core": "~2.7|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/http-foundation": "~2.7|~3.0"
},
"suggest": {

4
src/Symfony/Component/Security/Csrf/phpunit.xml.dist
View File

@ -12,9 +12,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/Security/Http/composer.json
View File

@ -23,6 +23,7 @@
"symfony/http-kernel": "~2.7|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/routing": "~2.7|~3.0",
"symfony/security-csrf": "~2.7|~3.0",
"psr/log": "~1.0"

4
src/Symfony/Component/Security/Http/phpunit.xml.dist
View File

@ -12,9 +12,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/Security/composer.json
View File

@ -28,6 +28,7 @@
"symfony/security-http": "self.version"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/intl": "~2.7|~3.0",
"symfony/routing": "~2.7|~3.0",
"symfony/translation": "~2.7|~3.0",

4
src/Symfony/Component/Security/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

14
src/Symfony/Component/Serializer/Tests/bootstrap.php
View File

@ -1,14 +0,0 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
$loader = require __DIR__.'/../vendor/autoload.php';
Doctrine\Common\Annotations\AnnotationRegistry::registerLoader(function ($class) { return class_exists($class); });

1
src/Symfony/Component/Serializer/composer.json
View File

@ -19,6 +19,7 @@
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/yaml": "~2.7|~3.0",
"symfony/config": "~2.7|~3.0",
"doctrine/annotations": "~1.0",

6
src/Symfony/Component/Serializer/phpunit.xml.dist
View File

@ -4,12 +4,10 @@
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="Tests/bootstrap.php"
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

3
src/Symfony/Component/Stopwatch/composer.json
View File

@ -18,6 +18,9 @@
"require": {
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0"
},
"autoload": {
"psr-0": { "Symfony\\Component\\Stopwatch\\": "" }
},

4
src/Symfony/Component/Stopwatch/phpunit.xml.dist
View File

@ -7,9 +7,7 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>

1
src/Symfony/Component/Templating/composer.json
View File

@ -19,6 +19,7 @@
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"psr/log": "~1.0"
},
"suggest": {

5
src/Symfony/Component/Templating/phpunit.xml.dist
View File

@ -7,10 +7,9 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>
<testsuite name="Symfony Templating Component Test Suite">
<directory>./Tests/</directory>

1
src/Symfony/Component/Translation/composer.json
View File

@ -19,6 +19,7 @@
"php": ">=5.5.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/config": "~2.7|~3.0",
"symfony/intl": "~2.7|~3.0",
"symfony/yaml": "~2.7|~3.0",

5
src/Symfony/Component/Translation/phpunit.xml.dist
View File

@ -7,10 +7,9 @@
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>
<testsuite name="Symfony Translation Component Test Suite">
<directory>./Tests/</directory>

14
src/Symfony/Component/Validator/Tests/bootstrap.php
View File

@ -1,14 +0,0 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
$loader = require __DIR__.'/../vendor/autoload.php';
Doctrine\Common\Annotations\AnnotationRegistry::registerLoader(function ($class) {return class_exists($class);});

1
src/Symfony/Component/Validator/composer.json
View File

@ -20,6 +20,7 @@
"symfony/translation": "~2.7|~3.0"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7|~3.0",
"symfony/http-foundation": "~2.7|~3.0",
"symfony/intl": "~2.7|~3.0",
"symfony/yaml": "~2.7|~3.0",

7
src/Symfony/Component/Validator/phpunit.xml.dist
View File

@ -4,13 +4,12 @@
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="Tests/bootstrap.php"
bootstrap="vendor/autoload.php"
>
<php>
<!-- Disable E_USER_DEPRECATED until 3.0 -->
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
<ini name="error_reporting" value="-16385"/>
<ini name="error_reporting" value="-1" />
</php>
<testsuites>
<testsuite name="Symfony Validator Component Test Suite">
<directory>./Tests/</directory>

Some files were not shown because too many files have changed in this diff Show More