From 67b91e562bbed909ea13b916b5797d1a4c366697 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 13 Jul 2012 15:39:54 +0200 Subject: [PATCH 001/975] [HttpKernel] added a way to enable a disable Profiler --- src/Symfony/Component/HttpKernel/Profiler/Profiler.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php index f2fc8a937a595..a4d27c2269651 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php +++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php @@ -51,6 +51,14 @@ public function disable() $this->enabled = false; } + /** + * Enables the profiler. + */ + public function enable() + { + $this->enabled = true; + } + /** * Loads the Profile for the given Response. * From f41872b9078fcfdc53dbe77ed3b66f317be775a1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 13 Jul 2012 15:40:24 +0200 Subject: [PATCH 002/975] [FrameworkBundle] added a way to enable the profiler for the very next request in functional tests (closes #4307) --- src/Symfony/Bundle/FrameworkBundle/Client.php | 40 +++++++++++++++ .../DependencyInjection/Configuration.php | 1 + .../FrameworkExtension.php | 4 ++ .../Resources/config/schema/symfony-1.0.xsd | 1 + .../DependencyInjection/Fixtures/php/full.php | 1 + .../DependencyInjection/Fixtures/xml/full.xml | 2 +- .../DependencyInjection/Fixtures/yml/full.yml | 1 + .../FrameworkExtensionTest.php | 3 ++ .../Controller/ProfilerController.php | 23 +++++++++ .../TestBundle/Resources/config/routing.yml | 4 ++ .../Tests/Functional/ProfilerTest.php | 49 +++++++++++++++++++ .../Tests/Functional/app/Profiler/bundles.php | 9 ++++ .../Tests/Functional/app/Profiler/config.yml | 6 +++ .../Tests/Functional/app/Profiler/routing.yml | 2 + 14 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/ProfilerController.php create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/bundles.php create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/config.yml create mode 100644 src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/routing.yml diff --git a/src/Symfony/Bundle/FrameworkBundle/Client.php b/src/Symfony/Bundle/FrameworkBundle/Client.php index cd6309b0bc1ed..3874573f90d74 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Client.php +++ b/src/Symfony/Bundle/FrameworkBundle/Client.php @@ -26,6 +26,7 @@ class Client extends BaseClient { private $hasPerformedRequest = false; + private $profiler = false; /** * Returns the container. @@ -61,6 +62,20 @@ public function getProfile() return $this->kernel->getContainer()->get('profiler')->loadProfileFromResponse($this->response); } + /** + * Enables the profiler for the very next request. + * + * @throws \LogicException if the profiler is not configured in the service container + */ + public function enableProfiler() + { + if (!$this->kernel->getContainer()->has('profiler')) { + throw new \LogicException('You cannot enable the profiler as it is not configured in the service container.'); + } + + $this->profiler = true; + } + /** * Makes a request. * @@ -78,9 +93,28 @@ protected function doRequest($request) $this->hasPerformedRequest = true; } + if ($this->profiler) { + $this->profiler = false; + + $this->kernel->boot(); + $this->kernel->getContainer()->get('profiler')->enable(); + } + return $this->kernel->handle($request); } + /** + * {@inheritdoc} + */ + protected function doRequestInProcess($request) + { + $response = parent::doRequestInProcess($request); + + $this->profiler = false; + + return $response; + } + /** * Returns the script to execute when the request must be insulated. * @@ -109,6 +143,11 @@ protected function getScript($request) $path = str_replace("'", "\\'", $r->getFileName()); + $profilerCode = ''; + if ($this->profiler) { + $profilerCode = '$kernel->getContainer()->get(\'profiler\')->enable();'; + } + return <<boot(); +$profilerCode echo serialize(\$kernel->handle(unserialize('$request'))); EOF; } diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index f2941c62254ec..bbda8f9fe1ffd 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -135,6 +135,7 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode) ->children() ->booleanNode('only_exceptions')->defaultFalse()->end() ->booleanNode('only_master_requests')->defaultFalse()->end() + ->booleanNode('enabled')->defaultTrue()->end() ->scalarNode('dsn')->defaultValue('file:%kernel.cache_dir%/profiler')->end() ->scalarNode('username')->defaultValue('')->end() ->scalarNode('password')->defaultValue('')->end() diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 938be74f43898..95ab24fa8dba3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -229,6 +229,10 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $ } } } + + if (!$config['enabled']) { + $container->getDefinition('profiler')->addMethodCall('disable', array()); + } } /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd index 5a97023d0766d..ddad0d1db6464 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd @@ -50,6 +50,7 @@ + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php index b4c1acc52e098..8b25687e7ad45 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php @@ -13,6 +13,7 @@ ), 'profiler' => array( 'only_exceptions' => true, + 'enabled' => false, ), 'router' => array( 'resource' => '%kernel.root_dir%/config/routing.xml', diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml index 3e75d66e690f4..703e2355fa0c5 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml @@ -10,7 +10,7 @@ - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml index f10bb5ccfec4c..2a4fda9191aa4 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml @@ -9,6 +9,7 @@ framework: enabled: true profiler: only_exceptions: true + enabled: false router: resource: %kernel.root_dir%/config/routing.xml type: xml diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index 385ece0c8cba5..4b6629ec8ee59 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -48,6 +48,9 @@ public function testProfiler() $this->assertTrue($container->hasDefinition('data_collector.config'), '->registerProfilerConfiguration() loads collectors.xml'); $this->assertTrue($container->getParameter('profiler_listener.only_exceptions')); $this->assertEquals('%profiler_listener.only_exceptions%', $container->getDefinition('profiler_listener')->getArgument(2)); + + $calls = $container->getDefinition('profiler')->getMethodCalls(); + $this->assertEquals('disable', $calls[0][0]); } public function testRouter() diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/ProfilerController.php new file mode 100644 index 0000000000000..0452e255eafe4 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/ProfilerController.php @@ -0,0 +1,23 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\Controller; + +use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\DependencyInjection\ContainerAware; + +class ProfilerController extends ContainerAware +{ + public function indexAction() + { + return new Response('Hello'); + } +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml index 69a8e6d45a2dd..2a077856f6bcf 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Resources/config/routing.yml @@ -17,3 +17,7 @@ session_setflash: session_showflash: pattern: /session_showflash defaults: { _controller: TestBundle:Session:showFlash} + +profiler: + pattern: /profiler + defaults: { _controller: TestBundle:Profiler:index } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php new file mode 100644 index 0000000000000..d4eb927ff8213 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php @@ -0,0 +1,49 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bundle\FrameworkBundle\Tests\Functional; + +/** + * @group functional + */ +class ProfilerTest extends WebTestCase +{ + /** + * @dataProvider getConfigs + */ + public function testProfilerIsDisabled($insulate) + { + $client = $this->createClient(array('test_case' => 'Profiler', 'root_config' => 'config.yml')); + if ($insulate) { + $client->insulate(); + } + + $client->request('GET', '/profiler'); + $this->assertFalse($client->getProfile()); + + // enable the profiler for the next request + $client->enableProfiler(); + $crawler = $client->request('GET', '/profiler'); + $profile = $client->getProfile(); + $this->assertTrue(is_object($profile)); + + $client->request('GET', '/profiler'); + $this->assertFalse($client->getProfile()); + } + + public function getConfigs() + { + return array( + array(false), + array(true), + ); + } +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/bundles.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/bundles.php new file mode 100644 index 0000000000000..351cf79d43231 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/bundles.php @@ -0,0 +1,9 @@ + Date: Fri, 20 Jul 2012 14:59:54 +0200 Subject: [PATCH 003/975] [FrameworkBundle] recursively resolve container parameter placeholders for arrays in router _defaults --- src/Symfony/Bundle/FrameworkBundle/Routing/Router.php | 8 ++++++++ .../FrameworkBundle/Tests/Routing/RouterTest.php | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php index 49c3dda9f8ff1..c4c348c25f3c3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php @@ -114,6 +114,14 @@ private function resolveString($value) { $container = $this->container; + if (is_array($value)) { + foreach ($value as $key => $val) { + $value[$key] = $this->resolveString($val); + } + + return $value; + } + if (null === $value || false === $value || true === $value || is_object($value)) { return $value; } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php index 2c6a031b69d14..0c8a5d3e0a5a8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php @@ -27,6 +27,8 @@ public function testDefaultsPlaceholders() 'foo' => 'before_%parameter.foo%', 'bar' => '%parameter.bar%_after', 'baz' => '%%unescaped%%', + 'boo' => array('%parameter%', '%%escaped_parameter%%', array('%bee_parameter%', 'bee')), + 'bee' => array('bee', 'bee'), ), array( ) @@ -39,6 +41,12 @@ public function testDefaultsPlaceholders() $sc->expects($this->at(3))->method('hasParameter')->will($this->returnValue(true)); $sc->expects($this->at(4))->method('getParameter')->will($this->returnValue('bar')); + $sc->expects($this->at(5))->method('hasParameter')->will($this->returnValue(true)); + $sc->expects($this->at(6))->method('getParameter')->will($this->returnValue('boo')); + + $sc->expects($this->at(7))->method('hasParameter')->will($this->returnValue(true)); + $sc->expects($this->at(8))->method('getParameter')->will($this->returnValue('foo_bee')); + $router = new Router($sc, 'foo'); $route = $router->getRouteCollection()->get('foo'); @@ -47,6 +55,8 @@ public function testDefaultsPlaceholders() 'foo' => 'before_foo', 'bar' => 'bar_after', 'baz' => '%unescaped%', + 'boo' => array('boo', '%escaped_parameter%', array('foo_bee', 'bee')), + 'bee' => array('bee', 'bee'), ), $route->getDefaults() ); From e2aa79b88542c1b26a5e904fd1672b741319738e Mon Sep 17 00:00:00 2001 From: Tim Nagel Date: Fri, 27 Jul 2012 09:25:56 +1000 Subject: [PATCH 004/975] Added CardScheme validator --- .../Validator/Constraints/CardScheme.php | 35 +++++++ .../Constraints/CardSchemeValidator.php | 92 +++++++++++++++++++ .../Constraints/CardSchemeValidatorTest.php | 81 ++++++++++++++++ 3 files changed, 208 insertions(+) create mode 100644 src/Symfony/Component/Validator/Constraints/CardScheme.php create mode 100644 src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php create mode 100644 src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php diff --git a/src/Symfony/Component/Validator/Constraints/CardScheme.php b/src/Symfony/Component/Validator/Constraints/CardScheme.php new file mode 100644 index 0000000000000..356cad930c5b3 --- /dev/null +++ b/src/Symfony/Component/Validator/Constraints/CardScheme.php @@ -0,0 +1,35 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Validator\Constraints; + +use Symfony\Component\Validator\Constraint; + +/** + * Metadata for the CardSchemeValidator. + * + * @Annotation + */ +class CardScheme extends Constraint +{ + public $message = 'Unsupported card type or invalid card number'; + public $schemes; + + public function getDefaultOption() + { + return 'schemes'; + } + + public function getRequiredOptions() + { + return array('schemes'); + } +} diff --git a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php new file mode 100644 index 0000000000000..97b4567491551 --- /dev/null +++ b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php @@ -0,0 +1,92 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Validator\Constraints; + +use Symfony\Component\Validator\Constraint; +use Symfony\Component\Validator\ConstraintValidator; + +/** + * Validates that a card number belongs to a specified scheme. + * + * @see http://en.wikipedia.org/wiki/Bank_card_number + * @author Tim Nagel + */ +class CardSchemeValidator extends ConstraintValidator +{ + protected $schemes = array( + 'AMEX' => array( + '/^(3[47])([0-9]{13})/' + ), + 'CHINA_UNIONPAY' => array( + '/^(62)([0-9]{16,19}/' + ), + 'DINERS' => array( + '/^(36)([0-9]{12})/', + '/^(30[0-5])([0-9]{11})/', + '/^(5[45])([0-9]{14})/' + ), + 'DISCOVER' => array( + '/^(6011)([0-9]{12})/', + '/^(64[4-9])([0-9]{13})/', + '/^(65)([0-9]{14})/', + '/^(622)(12[6-9]|1[3-9][0-9]|[2-8][0-9][0-9]|91[0-9]|92[0-5])([0-9]{10})/' + ), + 'INSTAPAYMENT' => array( + '/^(63[7-9])([0-9]{13})/' + ), + 'JCB' => array( + '/^(352[8-9]|35[3-8][0-9])([0-9]{12})/' + ), + 'LASER' => array( + '/^(6304|670[69]|6771)([0-9]{12, 15})/' + ), + 'MAESTRO' => array( + '/^(5018|5020|5038|6304|6759|6761|676[23]|0604)([0-9]{8, 15})/' + ), + 'MASTERCARD' => array( + '/^(5[1-5])([0-9]{14})/' + ), + 'VISA' => array( + '/^(4)([0-9]{12})/' + ), + ); + + /** + * Validates a creditcard belongs to a specified scheme. + * + * @param mixed $value + * @param Constraint $constraint + */ + public function validate($value, Constraint $constraint) + { + if (null === $value || '' === $value) { + return; + } + + if (!is_numeric($value)) { + $this->context->addViolation($constraint->message); + } + + $schemes = array_flip($constraint->schemes); + $schemeRegexes = array_intersect_key($this->schemes, $schemes); + + foreach ($schemeRegexes as $regexes) { + foreach ($regexes as $regex) { + if (preg_match($regex, $value)) { + return; + } + } + } + + $this->context->addViolation($constraint->message); + } +} diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php new file mode 100644 index 0000000000000..3fa3092dca2fd --- /dev/null +++ b/src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php @@ -0,0 +1,81 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Validator\Tests\Constraints; + +use Symfony\Component\Validator\Constraints\CardScheme; +use Symfony\Component\Validator\Constraints\CardSchemeValidator; + +class CardSchemeValidatorTest extends \PHPUnit_Framework_TestCase +{ + protected $context; + protected $validator; + + protected function setUp() + { + $this->context = $this->getMock('Symfony\Component\Validator\ExecutionContext', array(), array(), '', false); + $this->validator = new CardSchemeValidator(); + $this->validator->initialize($this->context); + } + + protected function tearDown() + { + $this->context = null; + $this->validator = null; + } + + public function testNullIsValid() + { + $this->context->expects($this->never()) + ->method('addViolation'); + + $this->validator->validate(null, new CardScheme(array('schemes' => array()))); + } + + public function testEmptyStringIsValid() + { + $this->context->expects($this->never()) + ->method('addViolation'); + + $this->validator->validate('', new CardScheme(array('schemes' => array()))); + } + + /** + * @dataProvider getValidNumbers + */ + public function testValidNumbers($scheme, $number) + { + $this->context->expects($this->never()) + ->method('addViolation'); + + $this->validator->validate($number, new CardScheme(array('schemes' => array($scheme)))); + } + + public function getValidNumbers() + { + return array( + array('VISA', '42424242424242424242'), + array('AMEX', '378282246310005'), + array('AMEX', '371449635398431'), + array('AMEX', '378734493671000'), + array('DINERS', '30569309025904'), + array('DISCOVER', '6011111111111117'), + array('DISCOVER', '6011000990139424'), + array('JCB', '3530111333300000'), + array('JCB', '3566002020360505'), + array('MASTERCARD', '5555555555554444'), + array('MASTERCARD', '5105105105105100'), + array('VISA', '4111111111111111'), + array('VISA', '4012888888881881'), + array('VISA', '4222222222222'), + ); + } +} From 6ff9b045c299a4c2499c02efa11bb414fdc668bb Mon Sep 17 00:00:00 2001 From: Tim Nagel Date: Wed, 4 Jul 2012 08:45:52 +1000 Subject: [PATCH 005/975] Add Luhn validator --- .../Component/Validator/Constraints/Luhn.php | 24 ++++ .../Validator/Constraints/LuhnValidator.php | 58 ++++++++++ .../Tests/Constraints/LuhnValidatorTest.php | 107 ++++++++++++++++++ 3 files changed, 189 insertions(+) create mode 100644 src/Symfony/Component/Validator/Constraints/Luhn.php create mode 100644 src/Symfony/Component/Validator/Constraints/LuhnValidator.php create mode 100644 src/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php diff --git a/src/Symfony/Component/Validator/Constraints/Luhn.php b/src/Symfony/Component/Validator/Constraints/Luhn.php new file mode 100644 index 0000000000000..f376045fc7de8 --- /dev/null +++ b/src/Symfony/Component/Validator/Constraints/Luhn.php @@ -0,0 +1,24 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Validator\Constraints; + +use Symfony\Component\Validator\Constraint; + +/** + * Metadata for the LuhnValidator. + * + * @Annotation + */ +class Luhn extends Constraint +{ + public $message = 'Invalid card number'; +} diff --git a/src/Symfony/Component/Validator/Constraints/LuhnValidator.php b/src/Symfony/Component/Validator/Constraints/LuhnValidator.php new file mode 100644 index 0000000000000..1ae8b399483ab --- /dev/null +++ b/src/Symfony/Component/Validator/Constraints/LuhnValidator.php @@ -0,0 +1,58 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Validator\Constraints; + +use Symfony\Component\Validator\Constraint; +use Symfony\Component\Validator\ConstraintValidator; + +/** + * Validates a PAN using the LUHN Algorithm + * + * For a list of example card numbers that are used to test this + * class, please see the LuhnValidatorTest class. + * + * @see http://en.wikipedia.org/wiki/Luhn_algorithm + * @author Tim Nagel + * @author Greg Knapp http://gregk.me/2011/php-implementation-of-bank-card-luhn-algorithm/ + */ +class LuhnValidator extends ConstraintValidator +{ + /** + * Validates a creditcard number with the Luhn algorithm. + * + * @param mixed $value + * @param Constraint $constraint + */ + public function validate($value, Constraint $constraint) + { + if (null === $value || '' === $value) { + return; + } + + if (!is_numeric($value)) { + $this->context->addViolation($constraint->message); + + return; + } + + $length = strlen($value); + $oddLength = $length % 2; + for ($sum = 0, $i = $length - 1; $i >= 0; $i--) { + $digit = (int) $value[$i]; + $sum += (($i % 2) === $oddLength) ? array_sum(str_split($digit * 2)) : $digit; + } + + if (($sum % 10) !== 0) { + $this->context->addViolation($constraint->message); + } + } +} diff --git a/src/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php new file mode 100644 index 0000000000000..3c057786391fa --- /dev/null +++ b/src/Symfony/Component/Validator/Tests/Constraints/LuhnValidatorTest.php @@ -0,0 +1,107 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Validator\Tests\Constraints; + +use Symfony\Component\Validator\Constraints\Luhn; +use Symfony\Component\Validator\Constraints\LuhnValidator; + +class LuhnValidatorTest extends \PHPUnit_Framework_TestCase +{ + protected $context; + protected $validator; + + protected function setUp() + { + $this->context = $this->getMock('Symfony\Component\Validator\ExecutionContext', array(), array(), '', false); + $this->validator = new LuhnValidator(); + $this->validator->initialize($this->context); + } + + protected function tearDown() + { + $this->context = null; + $this->validator = null; + } + + public function testNullIsValid() + { + $this->context->expects($this->never()) + ->method('addViolation'); + + $this->validator->validate(null, new Luhn()); + } + + public function testEmptyStringIsValid() + { + $this->context->expects($this->never()) + ->method('addViolation'); + + $this->validator->validate('', new Luhn()); + } + + /** + * @dataProvider getValidNumbers + */ + public function testValidNumbers($number) + { + $this->context->expects($this->never()) + ->method('addViolation'); + + $this->validator->validate($number, new Luhn()); + } + + public function getValidNumbers() + { + return array( + array('42424242424242424242'), + array('378282246310005'), + array('371449635398431'), + array('378734493671000'), + array('5610591081018250'), + array('30569309025904'), + array('38520000023237'), + array('6011111111111117'), + array('6011000990139424'), + array('3530111333300000'), + array('3566002020360505'), + array('5555555555554444'), + array('5105105105105100'), + array('4111111111111111'), + array('4012888888881881'), + array('4222222222222'), + array('5019717010103742'), + array('6331101999990016'), + ); + } + + /** + * @dataProvider getInvalidNumbers + */ + public function testInvalidNumbers($number) + { + $constraint = new Luhn(); + + $this->context->expects($this->once()) + ->method('addViolation') + ->with($constraint->message); + + $this->validator->validate($number, $constraint); + } + + public function getInvalidNumbers() + { + return array( + array('1234567812345678'), + array('4222222222222222'), + ); + } +} From 2f7bbbfec15222097d4632bf05344d9f4d09a198 Mon Sep 17 00:00:00 2001 From: Niklas Fiekas Date: Sun, 10 Jun 2012 17:37:24 +0200 Subject: [PATCH 006/975] [HttpFoundation] Added BinaryFileResponse. --- .../HttpFoundation/BinaryFileResponse.php | 259 ++++++++++++++++++ .../Tests/BinaryFileResponseTest.php | 124 +++++++++ 2 files changed, 383 insertions(+) create mode 100644 src/Symfony/Component/HttpFoundation/BinaryFileResponse.php create mode 100644 src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php new file mode 100644 index 0000000000000..080a4408552e4 --- /dev/null +++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php @@ -0,0 +1,259 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\HttpFoundation; + +use Symfony\Component\HttpFoundation\File\File; +use Symfony\Component\HttpFoundation\File\Exception\FileException; + +/** + * BinaryFileResponse represents an HTTP response delivering a file. + * + * @author Niklas Fiekas + * @author stealth35 + * @author Igor Wiedler + * @author Jordan Alliot + * @author Sergey Linnik + */ +class BinaryFileResponse extends Response +{ + protected static $trustXSendfileTypeHeader = false; + + protected $file; + protected $offset; + protected $maxlen; + + /** + * Constructor. + * + * @param SplFileInfo|string $file The file to stream + * @param integer $status The response status code + * @param array $headers An array of response headers + * @param boolean $public Files are public by default + * @param null|string $contentDisposition The type of Content-Disposition to set automatically with the filename + * @param boolean $autoEtag Whether the ETag header should be automatically set + * @param boolean $autoLastModified Whether the Last-Modified header should be automatically set + */ + public function __construct($file, $status = 200, $headers = array(), $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true) + { + parent::__construct(null, $status, $headers); + + $this->setFile($file, $contentDisposition, $autoEtag, $autoLastModified); + + if ($public) { + $this->setPublic(); + } + } + + /** + * {@inheritdoc} + */ + public static function create($file = null, $status = 200, $headers = array(), $public = true, $contentDisposition = null, $autoEtag = false, $autoLastModified = true) + { + return new static($file, $status, $headers, $public, $contentDisposition, $autoEtag, $autoLastModified); + } + + /** + * Sets the file to stream. + * + * @param SplFileInfo|string $file The file to stream + */ + public function setFile($file, $contentDisposition = null, $autoEtag = false, $autoLastModified = true) + { + $file = new File((string) $file); + + if (!$file->isReadable()) { + throw new FileException('File must be readable.'); + } + + $this->file = $file; + + if ($autoEtag) { + $this->setAutoEtag(); + } + + if ($autoLastModified) { + $this->setAutoLastModified(); + } + + if ($contentDisposition) { + $this->setContentDisposition($contentDisposition); + } + + return $this; + } + + /** + * Gets the file. + * + * @return File The file to stream + */ + public function getFile() + { + return $this->file; + } + + /** + * Automatically sets the Last-Modified header according the file modification date. + */ + public function setAutoLastModified() + { + $this->setLastModified(\DateTime::createFromFormat('U', $this->file->getMTime())); + + return $this; + } + + /** + * Automatically sets the ETag header according to the checksum of the file. + */ + public function setAutoEtag() + { + $this->setEtag(sha1_file($this->file->getPathname())); + + return $this; + } + + /** + * Sets the Content-Disposition header with the given filename. + * + * @param string $disposition ResponseHeaderBag::DISPOSITION_INLINE or ResponseHeaderBag::DISPOSITION_ATTACHMENT + * @param string $filename Optionally use this filename instead of the real name of the file + * @param string $filenameFallback A fallback filename, containing only ASCII characters. Defaults to an automatically encoded filename + */ + public function setContentDisposition($disposition, $filename = '', $filenameFallback = '') + { + if ($filename === '') { + $filename = $this->file->getFilename(); + } + + $dispositionHeader = $this->headers->makeDisposition($disposition, $filename, $filenameFallback); + $this->headers->set('Content-Disposition', $dispositionHeader); + + return $this; + } + + /** + * {@inheritdoc} + */ + public function prepare(Request $request) + { + $this->headers->set('Content-Length', $this->file->getSize()); + $this->headers->set('Accept-Ranges', 'bytes'); + $this->headers->set('Content-Transfer-Encoding', 'binary'); + + if (!$this->headers->has('Content-Type')) { + $this->headers->set('Content-Type', $this->file->getMimeType() ?: 'application/octet-stream'); + } + + if ('HTTP/1.0' != $request->server->get('SERVER_PROTOCOL')) { + $this->setProtocolVersion('1.1'); + } + + $this->offset = 0; + $this->maxlen = -1; + + if (self::$trustXSendfileTypeHeader && $request->headers->has('X-Sendfile-Type')) { + // Use X-Sendfile, do not send any content. + $type = $request->headers->get('X-Sendfile-Type'); + $path = $this->file->getRealPath(); + if (strtolower($type) == 'x-accel-redirect') { + // Do X-Accel-Mapping substitutions. + foreach (explode(',', $request->headers->get('X-Accel-Mapping', '')) as $mapping) { + $mapping = explode('=', $mapping, 2); + + if (2 == count($mapping)) { + $location = trim($mapping[0]); + $pathPrefix = trim($mapping[1]); + + if (substr($path, 0, strlen($pathPrefix)) == $pathPrefix) { + $path = $location . substr($path, strlen($pathPrefix)); + break; + } + } + } + } + $this->headers->set($type, $path); + $this->maxlen = 0; + } elseif ($request->headers->has('Range')) { + // Process the range headers. + if (!$request->headers->has('If-Range') || $this->getEtag() == $request->headers->get('If-Range')) { + $range = $request->headers->get('Range'); + + list($start, $end) = array_map('intval', explode('-', substr($range, 6), 2)) + array(0); + + if ('' !== $end) { + $this->maxlen = $end - $start; + } else { + $end = $this->file->getSize() - 1; + } + + $this->offset = $start; + + $this->setStatusCode(206); + $this->headers->set('Content-Range', sprintf('bytes %s-%s/%s', $start, $end, $this->file->getSize())); + } + } + } + + /** + * Sends the file. + */ + public function sendContent() + { + if (!$this->isSuccessful()) { + parent::sendContent(); + + return; + } + + if (0 === $this->maxlen) { + return; + } + + $out = fopen('php://output', 'wb'); + $file = fopen($this->file->getPathname(), 'rb'); + + stream_copy_to_stream($file, $out, $this->maxlen, $this->offset); + + fclose($out); + fclose($file); + } + + /** + * {@inheritdoc} + * + * @throws \LogicException when the content is not null + */ + public function setContent($content) + { + if (null !== $content) { + throw new \LogicException('The content cannot be set on a BinaryFileResponse instance.'); + } + } + + /** + * {@inheritdoc} + * + * @return false + */ + public function getContent() + { + return false; + } + + /** + * Trust X-Sendfile-Type header. + */ + public static function trustXSendfileTypeHeader() + { + self::$trustXSendfileTypeHeader = true; + } +} diff --git a/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php new file mode 100644 index 0000000000000..4a8fe5489fffa --- /dev/null +++ b/src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php @@ -0,0 +1,124 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\HttpFoundation\Tests; + +use Symfony\Component\HttpFoundation\BinaryFileResponse; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\ResponseHeaderBag; + +class BinaryFileResponseTest extends \PHPUnit_Framework_TestCase +{ + public function testConstruction() + { + $response = new BinaryFileResponse('README.md', 404, array('X-Header' => 'Foo'), true, null, true, true); + $this->assertEquals(404, $response->getStatusCode()); + $this->assertEquals('Foo', $response->headers->get('X-Header')); + $this->assertTrue($response->headers->has('ETag')); + $this->assertTrue($response->headers->has('Last-Modified')); + $this->assertFalse($response->headers->has('Content-Disposition')); + + $response = BinaryFileResponse::create('README.md', 404, array(), true, ResponseHeaderBag::DISPOSITION_INLINE); + $this->assertEquals(404, $response->getStatusCode()); + $this->assertFalse($response->headers->has('ETag')); + $this->assertEquals('inline; filename="README.md"', $response->headers->get('Content-Disposition')); + } + + /** + * @expectedException \LogicException + */ + public function testSetContent() + { + $response = new BinaryFileResponse('README.md'); + $response->setContent('foo'); + } + + public function testGetContent() + { + $response = new BinaryFileResponse('README.md'); + $this->assertFalse($response->getContent()); + } + + public function testRequests() + { + $response = BinaryFileResponse::create('src/Symfony/Component/HttpFoundation/Tests/File/Fixtures/test.gif')->setAutoEtag(); + + // do a request to get the ETag + $request = Request::create('/'); + $response->prepare($request); + $etag = $response->headers->get('ETag'); + + // prepare a request for a range of the testing file + $request = Request::create('/'); + $request->headers->set('If-Range', $etag); + $request->headers->set('Range', 'bytes=1-4'); + + $this->expectOutputString('IF8'); + $response = clone $response; + $response->prepare($request); + $response->sendContent(); + + $this->assertEquals('binary', $response->headers->get('Content-Transfer-Encoding')); + } + + public function testXSendfile() + { + $request = Request::create('/'); + $request->headers->set('X-Sendfile-Type', 'X-Sendfile'); + + BinaryFileResponse::trustXSendfileTypeHeader(); + $response = BinaryFileResponse::create('README.md'); + $response->prepare($request); + + $this->expectOutputString(''); + $response->sendContent(); + + $this->assertContains('README.md', $response->headers->get('X-Sendfile')); + } + + /** + * @dataProvider getSampleXAccelMappings + */ + public function testXAccelMapping($realpath, $mapping, $virtual) + { + $request = Request::create('/'); + $request->headers->set('X-Sendfile-Type', 'X-Accel-Redirect'); + $request->headers->set('X-Accel-Mapping', $mapping); + + $file = $this->getMockBuilder('Symfony\Component\HttpFoundation\File\File') + ->disableOriginalConstructor() + ->getMock(); + $file->expects($this->any()) + ->method('getRealPath') + ->will($this->returnValue($realpath)); + $file->expects($this->any()) + ->method('isReadable') + ->will($this->returnValue(true)); + + BinaryFileResponse::trustXSendFileTypeHeader(); + $response = new BinaryFileResponse('README.md'); + $reflection = new \ReflectionObject($response); + $property = $reflection->getProperty('file'); + $property->setAccessible(true); + $property->setValue($response, $file); + + $response->prepare($request); + $this->assertEquals($virtual, $response->headers->get('X-Accel-Redirect')); + } + + public function getSampleXAccelMappings() + { + return array( + array('/var/www/var/www/files/foo.txt', '/files/=/var/www/', '/files/var/www/files/foo.txt'), + array('/home/foo/bar.txt', '/files/=/var/www/,/baz/=/home/foo/', '/baz/bar.txt'), + ); + } +} From 92e10a87aca412df67a0e1dfa9bd1e397667c5a7 Mon Sep 17 00:00:00 2001 From: Jordan Alliot Date: Wed, 8 Aug 2012 00:06:54 +0200 Subject: [PATCH 007/975] Updated HttpFoundation and Locale for proper Composer autoloading --- composer.json | 9 +++++---- src/Symfony/Component/HttpFoundation/README.md | 2 +- src/Symfony/Component/HttpFoundation/composer.json | 6 ++---- src/Symfony/Component/Locale/README.md | 5 ++++- src/Symfony/Component/Locale/composer.json | 3 ++- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 045d434556b20..5e021fc66234f 100644 --- a/composer.json +++ b/composer.json @@ -62,10 +62,11 @@ "monolog/monolog": "dev-master" }, "autoload": { - "psr-0": { - "Symfony": "src/", - "SessionHandlerInterface": "src/Symfony/Component/HttpFoundation/Resources/stubs" - } + "psr-0": { "Symfony": "src/" }, + "classmap": [ + "src/Symfony/Component/HttpFoundation/Resources/stubs", + "src/Symfony/Component/Locale/Resources/stubs" + ] }, "minimum-stability": "dev", "extra": { diff --git a/src/Symfony/Component/HttpFoundation/README.md b/src/Symfony/Component/HttpFoundation/README.md index bb6f02c443c55..0c4a4a9dc3a61 100644 --- a/src/Symfony/Component/HttpFoundation/README.md +++ b/src/Symfony/Component/HttpFoundation/README.md @@ -31,7 +31,7 @@ the HTTP specification. Loading ------- -If you are using PHP 5.3.x you must add the following to your autoloader: +If you are not using Composer but are using PHP 5.3.x, you must add the following to your autoloader: // SessionHandlerInterface if (!interface_exists('SessionHandlerInterface')) { diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json index 4e4f90779fc64..95c9d70d56c41 100644 --- a/src/Symfony/Component/HttpFoundation/composer.json +++ b/src/Symfony/Component/HttpFoundation/composer.json @@ -19,10 +19,8 @@ "php": ">=5.3.3" }, "autoload": { - "psr-0": { - "Symfony\\Component\\HttpFoundation": "", - "SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stubs" - } + "psr-0": { "Symfony\\Component\\HttpFoundation": "" }, + "classmap": [ "Resources/stubs" ] }, "target-dir": "Symfony/Component/HttpFoundation", "extra": { diff --git a/src/Symfony/Component/Locale/README.md b/src/Symfony/Component/Locale/README.md index 7db3d6bf01a52..431a65a1fb03a 100644 --- a/src/Symfony/Component/Locale/README.md +++ b/src/Symfony/Component/Locale/README.md @@ -14,6 +14,9 @@ requires adding the following lines to your autoloader: $loader->registerPrefixFallback(__DIR__.'/../vendor/symfony/src/Symfony/Component/Locale/Resources/stubs'); } +If you are using Composer for autoloading, then you can even simplify it by +removing the ``$loader->registerPrefixFallback`` line. + Resources --------- @@ -33,4 +36,4 @@ This way the tests will use the ICU data files with the same version of your ``intl`` extension. Read the file ``Resources/data/UPDATE.txt`` for more info about building or -updating the ICU data files. \ No newline at end of file +updating the ICU data files. diff --git a/src/Symfony/Component/Locale/composer.json b/src/Symfony/Component/Locale/composer.json index 0c96cdefcdf5e..99a850c885c7c 100644 --- a/src/Symfony/Component/Locale/composer.json +++ b/src/Symfony/Component/Locale/composer.json @@ -22,7 +22,8 @@ "ext-intl": ">=5.3.3" }, "autoload": { - "psr-0": { "Symfony\\Component\\Locale": "" } + "psr-0": { "Symfony\\Component\\Locale": "" }, + "classmap": [ "Resources/stubs" ] }, "target-dir": "Symfony/Component/Locale", "extra": { From 5a53821ca34ea3f71c74be9985a24467bcdc77a6 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sun, 29 Jul 2012 18:01:50 +0300 Subject: [PATCH 008/975] [OptionsResolver] fix removing normalizers --- .../Component/OptionsResolver/Options.php | 1 + .../OptionsResolver/Tests/OptionsTest.php | 45 +++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/src/Symfony/Component/OptionsResolver/Options.php b/src/Symfony/Component/OptionsResolver/Options.php index ef10a19427630..5a2b0f7f381f3 100644 --- a/src/Symfony/Component/OptionsResolver/Options.php +++ b/src/Symfony/Component/OptionsResolver/Options.php @@ -143,6 +143,7 @@ public function replace(array $options) $this->options = array(); $this->lazy = array(); + $this->normalizers = array(); foreach ($options as $option => $value) { $this->overload($option, $value); diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php index e1510516116c2..66f9e399a435a 100644 --- a/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php +++ b/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php @@ -469,4 +469,49 @@ public function testHasWithNullValue() $this->assertTrue($this->options->has('foo')); } + + public function testRemoveOptionAndNormalizer() + { + $this->options->set('foo1', 'bar'); + $this->options->setNormalizer('foo1', function (Options $options) { + return ''; + }); + $this->options->set('foo2', 'bar'); + $this->options->setNormalizer('foo2', function (Options $options) { + return ''; + }); + + $this->options->remove('foo2'); + $this->assertEquals(array('foo1' => ''), $this->options->all()); + } + + public function testReplaceOptionAndNormalizer() + { + $this->options->set('foo1', 'bar'); + $this->options->setNormalizer('foo1', function (Options $options) { + return ''; + }); + $this->options->set('foo2', 'bar'); + $this->options->setNormalizer('foo2', function (Options $options) { + return ''; + }); + + $this->options->replace(array('foo1' => 'new')); + $this->assertEquals(array('foo1' => 'new'), $this->options->all()); + } + + public function testClearOptionAndNormalizer() + { + $this->options->set('foo1', 'bar'); + $this->options->setNormalizer('foo1', function (Options $options) { + return ''; + }); + $this->options->set('foo2', 'bar'); + $this->options->setNormalizer('foo2', function (Options $options) { + return ''; + }); + + $this->options->clear(); + $this->assertEmpty($this->options->all()); + } } From e2a50ef4bc05c0c719d00d1cbbf680a3e8c1bb4a Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Mon, 30 Jul 2012 23:35:43 +0200 Subject: [PATCH 009/975] [OptionsResolver] fix normalizer without corresponding option --- src/Symfony/Component/OptionsResolver/Options.php | 2 +- .../Component/OptionsResolver/Tests/OptionsTest.php | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/OptionsResolver/Options.php b/src/Symfony/Component/OptionsResolver/Options.php index 5a2b0f7f381f3..3c1129c9217a9 100644 --- a/src/Symfony/Component/OptionsResolver/Options.php +++ b/src/Symfony/Component/OptionsResolver/Options.php @@ -504,7 +504,7 @@ private function normalize($option) $normalizer = $this->normalizers[$option]; $this->lock[$option] = true; - $this->options[$option] = $normalizer($this, $this->options[$option]); + $this->options[$option] = $normalizer($this, array_key_exists($option, $this->options) ? $this->options[$option] : null); unset($this->lock[$option]); // The option is now normalized diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php index 66f9e399a435a..f739c911a1dc6 100644 --- a/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php +++ b/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php @@ -514,4 +514,15 @@ public function testClearOptionAndNormalizer() $this->options->clear(); $this->assertEmpty($this->options->all()); } + + public function testNormalizerWithoutCorrespondingOption() + { + $test = $this; + + $this->options->setNormalizer('foo', function (Options $options, $previousValue) use ($test) { + $test->assertNull($previousValue); + return ''; + }); + $this->assertEquals(array('foo' => ''), $this->options->all()); + } } From e271b176b84c314ffd2b09a0b2eac32a25836f58 Mon Sep 17 00:00:00 2001 From: Marcel Beerta Date: Sat, 25 Aug 2012 17:46:58 +0200 Subject: [PATCH 010/975] Remove the string optimization since it causes no real performance gain but increases generation time of the dumped PHP Container --- src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php | 3 --- .../DependencyInjection/Tests/Fixtures/php/services9.php | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 4a29d234484c3..639503cc7b513 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -1049,9 +1049,6 @@ private function dumpValue($value, $interpolate = true) $code = str_replace('%%', '%', preg_replace_callback('/(?get('foo.baz'); - $instance = call_user_func(array('FooClass', 'getInstance'), 'foo', $a, array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo'), 'bar' => $this->getParameter('foo')), true, $this); + $instance = call_user_func(array('FooClass', 'getInstance'), 'foo', $a, array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo').'', 'bar' => $this->getParameter('foo')), true, $this); $instance->setBar($this->get('bar')); $instance->initialize(); From c5e77930043a1e07ec08af6352bfa64e9afced35 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 30 Aug 2012 21:25:16 +0200 Subject: [PATCH 011/975] [Process] Normalize exceptions --- .../Exception/InvalidArgumentException.php | 21 +++++++++++++ .../Process/Exception/LogicException.php | 21 +++++++++++++ .../Exception/ProcessFailedException.php | 2 +- src/Symfony/Component/Process/PhpProcess.php | 4 ++- src/Symfony/Component/Process/Process.php | 31 ++++++++++--------- .../Component/Process/ProcessBuilder.php | 7 +++-- .../Process/Tests/ProcessBuilderTest.php | 2 +- .../Tests/ProcessFailedExceptionTest.php | 3 +- .../Component/Process/Tests/ProcessTest.php | 4 +-- 9 files changed, 72 insertions(+), 23 deletions(-) create mode 100644 src/Symfony/Component/Process/Exception/InvalidArgumentException.php create mode 100644 src/Symfony/Component/Process/Exception/LogicException.php diff --git a/src/Symfony/Component/Process/Exception/InvalidArgumentException.php b/src/Symfony/Component/Process/Exception/InvalidArgumentException.php new file mode 100644 index 0000000000000..926ee2118b037 --- /dev/null +++ b/src/Symfony/Component/Process/Exception/InvalidArgumentException.php @@ -0,0 +1,21 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Process\Exception; + +/** + * InvalidArgumentException for the Process Component. + * + * @author Romain Neutron + */ +class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface +{ +} diff --git a/src/Symfony/Component/Process/Exception/LogicException.php b/src/Symfony/Component/Process/Exception/LogicException.php new file mode 100644 index 0000000000000..be3d490dde8cd --- /dev/null +++ b/src/Symfony/Component/Process/Exception/LogicException.php @@ -0,0 +1,21 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Process\Exception; + +/** + * LogicException for the Process Component. + * + * @author Romain Neutron + */ +class LogicException extends \LogicException implements ExceptionInterface +{ +} diff --git a/src/Symfony/Component/Process/Exception/ProcessFailedException.php b/src/Symfony/Component/Process/Exception/ProcessFailedException.php index a4540c065710c..010789ddac41a 100755 --- a/src/Symfony/Component/Process/Exception/ProcessFailedException.php +++ b/src/Symfony/Component/Process/Exception/ProcessFailedException.php @@ -25,7 +25,7 @@ class ProcessFailedException extends RuntimeException public function __construct(Process $process) { if ($process->isSuccessful()) { - throw new \InvalidArgumentException('Expected a failed process, but the given process was successful.'); + throw new InvalidArgumentException('Expected a failed process, but the given process was successful.'); } parent::__construct( diff --git a/src/Symfony/Component/Process/PhpProcess.php b/src/Symfony/Component/Process/PhpProcess.php index 2bd5600451567..956052d421aac 100644 --- a/src/Symfony/Component/Process/PhpProcess.php +++ b/src/Symfony/Component/Process/PhpProcess.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Process; +use Symfony\Component\Process\Exception\RuntimeException; + /** * PhpProcess runs a PHP script in an independent process. * @@ -68,7 +70,7 @@ public function run($callback = null) { if (null === $this->getCommandLine()) { if (false === $php = $this->executableFinder->find()) { - throw new \RuntimeException('Unable to find the PHP executable.'); + throw new RuntimeException('Unable to find the PHP executable.'); } $this->setCommandLine($php); } diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index cd1e8b42155a2..14d304708541a 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -11,6 +11,9 @@ namespace Symfony\Component\Process; +use Symfony\Component\Process\Exception\InvalidArgumentException; +use Symfony\Component\Process\Exception\RuntimeException; + /** * Process is a thin wrapper around proc_* functions to ease * start independent PHP processes. @@ -111,14 +114,14 @@ class Process * @param integer $timeout The timeout in seconds * @param array $options An array of options for proc_open * - * @throws \RuntimeException When proc_open is not installed + * @throws RuntimeException When proc_open is not installed * * @api */ public function __construct($commandline, $cwd = null, array $env = null, $stdin = null, $timeout = 60, array $options = array()) { if (!function_exists('proc_open')) { - throw new \RuntimeException('The Process class relies on proc_open, which is not available on your PHP installation.'); + throw new RuntimeException('The Process class relies on proc_open, which is not available on your PHP installation.'); } $this->commandline = $commandline; @@ -158,7 +161,7 @@ public function __destruct() * * @return integer The exit status code * - * @throws \RuntimeException When process can't be launch or is stopped + * @throws RuntimeException When process can't be launch or is stopped * * @api */ @@ -187,13 +190,13 @@ public function run($callback = null) * @param Closure|string|array $callback A PHP callback to run whenever there is some * output available on STDOUT or STDERR * - * @throws \RuntimeException When process can't be launch or is stopped - * @throws \RuntimeException When process is already running + * @throws RuntimeException When process can't be launch or is stopped + * @throws RuntimeException When process is already running */ public function start($callback = null) { if ($this->isRunning()) { - throw new \RuntimeException('Process is already running'); + throw new RuntimeException('Process is already running'); } $this->stdout = ''; @@ -233,7 +236,7 @@ public function start($callback = null) $this->process = proc_open($commandline, $descriptors, $this->pipes, $this->cwd, $this->env, $this->options); if (!is_resource($this->process)) { - throw new \RuntimeException('Unable to launch a new process.'); + throw new RuntimeException('Unable to launch a new process.'); } $this->status = self::STATUS_STARTED; @@ -270,7 +273,7 @@ public function start($callback = null) if ($n === 0) { proc_terminate($this->process); - throw new \RuntimeException('The process timed out.'); + throw new RuntimeException('The process timed out.'); } if ($w) { @@ -311,7 +314,7 @@ public function start($callback = null) * * @return int The exitcode of the process * - * @throws \RuntimeException + * @throws RuntimeException */ public function wait($callback = null) { @@ -337,7 +340,7 @@ public function wait($callback = null) if (0 === $n) { proc_terminate($this->process); - throw new \RuntimeException('The process timed out.'); + throw new RuntimeException('The process timed out.'); } foreach ($r as $pipe) { @@ -361,7 +364,7 @@ public function wait($callback = null) } $this->updateStatus(); if ($this->processInformation['signaled']) { - throw new \RuntimeException(sprintf('The process stopped because of a "%s" signal.', $this->processInformation['stopsig'])); + throw new RuntimeException(sprintf('The process stopped because of a "%s" signal.', $this->processInformation['stopsig'])); } $time = 0; @@ -373,7 +376,7 @@ public function wait($callback = null) $exitcode = proc_close($this->process); if ($this->processInformation['signaled']) { - throw new \RuntimeException(sprintf('The process stopped because of a "%s" signal.', $this->processInformation['stopsig'])); + throw new RuntimeException(sprintf('The process stopped because of a "%s" signal.', $this->processInformation['stopsig'])); } $this->exitcode = $this->processInformation['running'] ? $exitcode : $this->processInformation['exitcode']; @@ -546,7 +549,7 @@ public function isRunning() * * @return integer The exitcode of the process * - * @throws \RuntimeException if the process got signaled + * @throws RuntimeException if the process got signaled */ public function stop($timeout=10) { @@ -622,7 +625,7 @@ public function setTimeout($timeout) $timeout = (integer) $timeout; if ($timeout < 0) { - throw new \InvalidArgumentException('The timeout value must be a valid positive integer.'); + throw new InvalidArgumentException('The timeout value must be a valid positive integer.'); } $this->timeout = $timeout; diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/ProcessBuilder.php index 2ffb3af5ffb98..2a88ea00d4bab 100644 --- a/src/Symfony/Component/Process/ProcessBuilder.php +++ b/src/Symfony/Component/Process/ProcessBuilder.php @@ -11,6 +11,9 @@ namespace Symfony\Component\Process; +use Symfony\Component\Process\Exception\InvalidArgumentException; +use Symfony\Component\Process\Exception\LogicException; + /** * Process builder. * @@ -99,7 +102,7 @@ public function setTimeout($timeout) $timeout = (integer) $timeout; if ($timeout < 0) { - throw new \InvalidArgumentException('The timeout value must be a valid positive integer.'); + throw new InvalidArgumentException('The timeout value must be a valid positive integer.'); } $this->timeout = $timeout; @@ -117,7 +120,7 @@ public function setOption($name, $value) public function getProcess() { if (!count($this->arguments)) { - throw new \LogicException('You must add() command arguments before calling getProcess().'); + throw new LogicException('You must add() command arguments before calling getProcess().'); } $options = $this->options; diff --git a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php index 9ca45a80a7905..4f6157e46e7ff 100644 --- a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php +++ b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php @@ -85,7 +85,7 @@ public function shouldNotReplaceExplicitlySetVars() } /** - * @expectedException \InvalidArgumentException + * @expectedException Symfony\Component\Process\Exception\InvalidArgumentException */ public function testNegativeTimeoutFromSetter() { diff --git a/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php b/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php index 356c7debaa02b..9bc2fdf30fa58 100644 --- a/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php +++ b/src/Symfony/Component/Process/Tests/ProcessFailedExceptionTest.php @@ -11,8 +11,7 @@ namespace Symfony\Component\Process\Tests; -use Symfony\Component\Process\Process, - Symfony\Component\Process\Exception\ProcessFailedException; +use Symfony\Component\Process\Exception\ProcessFailedException; /** * @author Sebastian Marek diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php index 64f929cc20d61..da04712f84190 100644 --- a/src/Symfony/Component/Process/Tests/ProcessTest.php +++ b/src/Symfony/Component/Process/Tests/ProcessTest.php @@ -19,7 +19,7 @@ class ProcessTest extends \PHPUnit_Framework_TestCase { /** - * @expectedException \InvalidArgumentException + * @expectedException Symfony\Component\Process\Exception\InvalidArgumentException */ public function testNegativeTimeoutFromConstructor() { @@ -27,7 +27,7 @@ public function testNegativeTimeoutFromConstructor() } /** - * @expectedException \InvalidArgumentException + * @expectedException Symfony\Component\Process\Exception\InvalidArgumentException */ public function testNegativeTimeoutFromSetter() { From bcd8db2a344f279ce80700901249aa858c0de79e Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 30 Aug 2012 21:32:42 +0200 Subject: [PATCH 012/975] [DependencyInjection] Normalize exceptions --- .../Component/DependencyInjection/Loader/XmlFileLoader.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php index 5329195cdb8a2..e32e787dd1807 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php @@ -11,13 +11,13 @@ namespace Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\Config\Resource\FileResource; use Symfony\Component\DependencyInjection\DefinitionDecorator; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\Alias; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\SimpleXMLElement; -use Symfony\Component\Config\Resource\FileResource; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; use Symfony\Component\DependencyInjection\Exception\RuntimeException; @@ -213,7 +213,7 @@ private function parseFile($file) if (!$dom->loadXML(file_get_contents($file), LIBXML_NONET | (defined('LIBXML_COMPACT') ? LIBXML_COMPACT : 0))) { libxml_disable_entity_loader($disableEntities); - throw new \InvalidArgumentException(implode("\n", $this->getXmlErrors($internalErrors))); + throw new InvalidArgumentException(implode("\n", $this->getXmlErrors($internalErrors))); } $dom->normalizeDocument(); @@ -222,7 +222,7 @@ private function parseFile($file) foreach ($dom->childNodes as $child) { if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) { - throw new \InvalidArgumentException('Document types are not allowed.'); + throw new InvalidArgumentException('Document types are not allowed.'); } } From b0f5f2e7f27b1e71ec9393e32079a87df6ac0ac7 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 30 Aug 2012 21:37:05 +0200 Subject: [PATCH 013/975] [Serializer] Normalize exceptions --- .../Serializer/Normalizer/GetSetMethodNormalizer.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php index 4dfe1770e5787..dab97fe658a76 100644 --- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Serializer\Normalizer; +use Symfony\Component\Serializer\Exception\InvalidArgumentException; use Symfony\Component\Serializer\Exception\RuntimeException; /** @@ -42,12 +43,14 @@ class GetSetMethodNormalizer extends SerializerAwareNormalizer implements Normal * Set normalization callbacks * * @param array $callbacks help normalize the result + * + * @throws InvalidArgumentException if a non-callable callback is set */ public function setCallbacks(array $callbacks) { foreach ($callbacks as $attribute => $callback) { if (!is_callable($callback)) { - throw new \InvalidArgumentException(sprintf('The given callback for attribute "%s" is not callable.', $attribute)); + throw new InvalidArgumentException(sprintf('The given callback for attribute "%s" is not callable.', $attribute)); } } $this->callbacks = $callbacks; From f2e4802565ba03558a02b898bb4520bce4845c54 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 30 Aug 2012 21:54:08 +0200 Subject: [PATCH 014/975] [Yaml] Normalize exceptions --- .../Yaml/Exception/DumpException.php | 2 +- .../Yaml/Exception/ParseException.php | 2 +- .../Yaml/Exception/RuntimeException.php | 23 +++++++++++++++++++ src/Symfony/Component/Yaml/Unescaper.php | 4 ++-- 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 src/Symfony/Component/Yaml/Exception/RuntimeException.php diff --git a/src/Symfony/Component/Yaml/Exception/DumpException.php b/src/Symfony/Component/Yaml/Exception/DumpException.php index 53952ce1adfd1..9b3e6de079588 100644 --- a/src/Symfony/Component/Yaml/Exception/DumpException.php +++ b/src/Symfony/Component/Yaml/Exception/DumpException.php @@ -18,6 +18,6 @@ * * @api */ -class DumpException extends \RuntimeException implements ExceptionInterface +class DumpException extends RuntimeException { } diff --git a/src/Symfony/Component/Yaml/Exception/ParseException.php b/src/Symfony/Component/Yaml/Exception/ParseException.php index 975fe6d46eb7d..a27a005e6f551 100644 --- a/src/Symfony/Component/Yaml/Exception/ParseException.php +++ b/src/Symfony/Component/Yaml/Exception/ParseException.php @@ -18,7 +18,7 @@ * * @api */ -class ParseException extends \RuntimeException implements ExceptionInterface +class ParseException extends RuntimeException { private $parsedFile; private $parsedLine; diff --git a/src/Symfony/Component/Yaml/Exception/RuntimeException.php b/src/Symfony/Component/Yaml/Exception/RuntimeException.php new file mode 100644 index 0000000000000..3573bf15abb81 --- /dev/null +++ b/src/Symfony/Component/Yaml/Exception/RuntimeException.php @@ -0,0 +1,23 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Yaml\Exception; + +/** + * Exception class thrown when an error occurs during parsing. + * + * @author Romain Neutron + * + * @api + */ +class RuntimeException extends \RuntimeException implements ExceptionInterface +{ +} diff --git a/src/Symfony/Component/Yaml/Unescaper.php b/src/Symfony/Component/Yaml/Unescaper.php index ac3a576b677bc..708f2a18f2851 100644 --- a/src/Symfony/Component/Yaml/Unescaper.php +++ b/src/Symfony/Component/Yaml/Unescaper.php @@ -130,7 +130,7 @@ public function unescapeCharacter($value) * * @return string The string with the new encoding * - * @throws \RuntimeException if no suitable encoding function is found (iconv or mbstring) + * @throws RuntimeException if no suitable encoding function is found (iconv or mbstring) */ private function convertEncoding($value, $to, $from) { @@ -140,6 +140,6 @@ private function convertEncoding($value, $to, $from) return iconv($from, $to, $value); } - throw new \RuntimeException('No suitable convert encoding function (install the iconv or mbstring extension).'); + throw new RuntimeException('No suitable convert encoding function (install the iconv or mbstring extension).'); } } From 4efb9fec500247a7aab5860bd04bd912926a67c8 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sat, 18 Aug 2012 14:43:48 +0300 Subject: [PATCH 015/975] [Form] Remove unneeded FormUtil constants MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They are part of the public API (as const are always public) but cannot be used at all from outside the class as the$pluralMap is private. The meaning of the indices is already documented in the array. --- src/Symfony/Component/Form/Util/FormUtil.php | 22 +++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/Symfony/Component/Form/Util/FormUtil.php b/src/Symfony/Component/Form/Util/FormUtil.php index 614361c49b369..b4048f76a6ca7 100644 --- a/src/Symfony/Component/Form/Util/FormUtil.php +++ b/src/Symfony/Component/Form/Util/FormUtil.php @@ -16,16 +16,6 @@ */ abstract class FormUtil { - const PLURAL_SUFFIX = 0; - - const PLURAL_SUFFIX_LENGTH = 1; - - const PLURAL_SUFFIX_AFTER_VOCAL = 2; - - const PLURAL_SUFFIX_AFTER_CONS = 3; - - const SINGULAR_SUFFIX = 4; - /** * Map english plural to singular suffixes * @@ -128,8 +118,8 @@ public static function singularify($plural) // in the plural table to compare them with the characters of the actual // given plural suffix for ($i = 0, $numPlurals = count(self::$pluralMap); $i < $numPlurals; ++$i) { - $suffix = self::$pluralMap[$i][self::PLURAL_SUFFIX]; - $suffixLength = self::$pluralMap[$i][self::PLURAL_SUFFIX_LENGTH]; + $suffix = self::$pluralMap[$i][0]; + $suffixLength = self::$pluralMap[$i][1]; $j = 0; // Compare characters in the plural table and of the suffix of the @@ -145,17 +135,19 @@ public static function singularify($plural) if ($j < $pluralLength) { $nextIsVocal = false !== strpos('aeiou', $lowerPluralRev[$j]); - if (!self::$pluralMap[$i][self::PLURAL_SUFFIX_AFTER_VOCAL] && $nextIsVocal) { + if (!self::$pluralMap[$i][2] && $nextIsVocal) { + // suffix may not succeed a vocal but next char is one break; } - if (!self::$pluralMap[$i][self::PLURAL_SUFFIX_AFTER_CONS] && !$nextIsVocal) { + if (!self::$pluralMap[$i][3] && !$nextIsVocal) { + // suffix may not succeed a consonant but next char is one break; } } $newBase = substr($plural, 0, $pluralLength - $suffixLength); - $newSuffix = self::$pluralMap[$i][self::SINGULAR_SUFFIX]; + $newSuffix = self::$pluralMap[$i][4]; // Check whether the first character in the plural suffix // is uppercased. If yes, uppercase the first character in From 0f86a33b610c8fd97c468ba11ecca131476ff395 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sat, 18 Aug 2012 17:12:41 +0200 Subject: [PATCH 016/975] micro-optim: replace for with foreach --- src/Symfony/Component/Form/Util/FormUtil.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Component/Form/Util/FormUtil.php b/src/Symfony/Component/Form/Util/FormUtil.php index b4048f76a6ca7..5e8d461698ff1 100644 --- a/src/Symfony/Component/Form/Util/FormUtil.php +++ b/src/Symfony/Component/Form/Util/FormUtil.php @@ -113,13 +113,13 @@ public static function singularify($plural) $lowerPluralRev = strtolower($pluralRev); $pluralLength = strlen($lowerPluralRev); - // The outer loop $i iterates over the entries of the plural table + // The outer loop iterates over the entries of the plural table // The inner loop $j iterates over the characters of the plural suffix // in the plural table to compare them with the characters of the actual // given plural suffix - for ($i = 0, $numPlurals = count(self::$pluralMap); $i < $numPlurals; ++$i) { - $suffix = self::$pluralMap[$i][0]; - $suffixLength = self::$pluralMap[$i][1]; + foreach (self::$pluralMap as $map) { + $suffix = $map[0]; + $suffixLength = $map[1]; $j = 0; // Compare characters in the plural table and of the suffix of the @@ -135,19 +135,19 @@ public static function singularify($plural) if ($j < $pluralLength) { $nextIsVocal = false !== strpos('aeiou', $lowerPluralRev[$j]); - if (!self::$pluralMap[$i][2] && $nextIsVocal) { + if (!$map[2] && $nextIsVocal) { // suffix may not succeed a vocal but next char is one break; } - if (!self::$pluralMap[$i][3] && !$nextIsVocal) { + if (!$map[3] && !$nextIsVocal) { // suffix may not succeed a consonant but next char is one break; } } $newBase = substr($plural, 0, $pluralLength - $suffixLength); - $newSuffix = self::$pluralMap[$i][4]; + $newSuffix = $map[4]; // Check whether the first character in the plural suffix // is uppercased. If yes, uppercase the first character in From 1f5b7930c03b899e322383b14bb87b95333603bd Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Tue, 4 Sep 2012 06:31:46 +0200 Subject: [PATCH 017/975] [Routing] fix setting empty requirement in Route --- src/Symfony/Component/Routing/Route.php | 22 ++++++++++--------- .../Component/Routing/Tests/RouteTest.php | 5 ++++- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php index 318426a0db09c..fd9d90dc95444 100644 --- a/src/Symfony/Component/Routing/Route.php +++ b/src/Symfony/Component/Routing/Route.php @@ -179,7 +179,7 @@ public function setOption($name, $value) * * @param string $name An option name * - * @return mixed The option value + * @return mixed The option value or null when not given */ public function getOption($name) { @@ -236,7 +236,7 @@ public function addDefaults(array $defaults) * * @param string $name A variable name * - * @return mixed The default value + * @return mixed The default value or null when not given */ public function getDefault($name) { @@ -323,7 +323,7 @@ public function addRequirements(array $requirements) * * @param string $key The key * - * @return string The regex + * @return string|null The regex or null when not given */ public function getRequirement($key) { @@ -352,6 +352,8 @@ public function setRequirement($key, $regex) * Compiles the route. * * @return CompiledRoute A CompiledRoute instance + * + * @see RouteCompiler which is responsible for the compilation process */ public function compile() { @@ -371,21 +373,21 @@ public function compile() private function sanitizeRequirement($key, $regex) { if (!is_string($regex)) { - throw new \InvalidArgumentException(sprintf('Routing requirement for "%s" must be a string', $key)); - } - - if ('' === $regex) { - throw new \InvalidArgumentException(sprintf('Routing requirement for "%s" cannot be empty', $key)); + throw new \InvalidArgumentException(sprintf('Routing requirement for "%s" must be a string.', $key)); } - if ('^' === $regex[0]) { - $regex = substr($regex, 1); + if ('' !== $regex && '^' === $regex[0]) { + $regex = (string) substr($regex, 1); // returns false for a single character } if ('$' === substr($regex, -1)) { $regex = substr($regex, 0, -1); } + if ('' === $regex) { + throw new \InvalidArgumentException(sprintf('Routing requirement for "%s" cannot be empty.', $key)); + } + return $regex; } } diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php index 8e466826dae35..8a42b724f8898 100644 --- a/src/Symfony/Component/Routing/Tests/RouteTest.php +++ b/src/Symfony/Component/Routing/Tests/RouteTest.php @@ -112,7 +112,10 @@ public function getInvalidRequirements() { return array( array(''), - array(array()) + array(array()), + array('^$'), + array('^'), + array('$') ); } From be28e56f4e1646675d07af8163b069f29ce00f06 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Tue, 4 Sep 2012 07:10:18 +0200 Subject: [PATCH 018/975] [Routing] disallow numeric named variables in pattern because PHP raises an error for such subpatterns in PCRE and thus would break matching, e.g. '(?<123>.+)'. --- .../Component/Routing/RouteCompiler.php | 9 +++++++-- .../Routing/Tests/RouteCompilerTest.php | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Routing/RouteCompiler.php b/src/Symfony/Component/Routing/RouteCompiler.php index e19f8d50d566b..76877bc14b85d 100644 --- a/src/Symfony/Component/Routing/RouteCompiler.php +++ b/src/Symfony/Component/Routing/RouteCompiler.php @@ -23,8 +23,10 @@ class RouteCompiler implements RouteCompilerInterface /** * {@inheritDoc} * - * @throws \LogicException If a variable is referenced more than once or if a required variable - * has a default value that doesn't meet its own requirement. + * @throws \LogicException If a variable is referenced more than once or if a required variable + * has a default value that doesn't meet its own requirement. + * @throws \DomainException If a variable name is numeric because PHP raises an error for such + * subpatterns in PCRE and thus would break matching, e.g. "(?<123>.+)". */ public function compile(Route $route) { @@ -57,6 +59,9 @@ public function compile(Route $route) $tokens[] = array('variable', $match[0][0][0], $regexp, $var); + if (is_numeric($var)) { + throw new \DomainException(sprintf('Variable name "%s" cannot be numeric in route pattern "%s". Please use a different name.', $var, $route->getPattern())); + } if (in_array($var, $variables)) { throw new \LogicException(sprintf('Route pattern "%s" cannot reference variable name "%s" more than once.', $route->getPattern(), $var)); } diff --git a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php index 4a32387fd0eb0..fee2ae1304888 100644 --- a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php +++ b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php @@ -144,4 +144,23 @@ public function testRouteWithRequiredVariableAndBadDefault() // irrelevant for both matching and generating URLs. $route->compile(); } + + /** + * @dataProvider getNumericVariableNames + * @expectedException \DomainException + */ + public function testRouteWithNumericVariableName($name) + { + $route = new Route('/{'. $name . '}'); + $route->compile(); + } + + public function getNumericVariableNames() + { + return array( + array('09'), + array('123'), + array('1e2') + ); + } } From 02516de6521b3806b3708d6f0d1c8fe8be05f3a2 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Tue, 4 Sep 2012 07:18:13 +0200 Subject: [PATCH 019/975] [Routing] fix variable with a requirement of '0' --- src/Symfony/Component/Routing/RouteCompiler.php | 2 +- src/Symfony/Component/Routing/Tests/RouteCompilerTest.php | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Routing/RouteCompiler.php b/src/Symfony/Component/Routing/RouteCompiler.php index e19f8d50d566b..7dcae85f10d8f 100644 --- a/src/Symfony/Component/Routing/RouteCompiler.php +++ b/src/Symfony/Component/Routing/RouteCompiler.php @@ -42,7 +42,7 @@ public function compile(Route $route) $pos = $match[0][1] + strlen($match[0][0]); $var = $match[1][0]; - if ($req = $route->getRequirement($var)) { + if (null !== $req = $route->getRequirement($var)) { $regexp = $req; } else { // Use the character preceding the variable as a separator diff --git a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php index 4a32387fd0eb0..d871a05bd9ba4 100644 --- a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php +++ b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php @@ -90,6 +90,13 @@ public function provideCompileData() array('variable', '/', '[^/]+', 'bar'), )), + array( + 'Route with a requirement of 0', + array('/{bar}', array('bar' => null), array('bar' => '0')), + '', '#^/(?0)?$#s', array('bar'), array( + array('variable', '/', '0', 'bar'), + )), + array( 'Route with an optional variable as the first segment with requirements', array('/{bar}', array('bar' => 'bar'), array('bar' => '(foo|bar)')), From 9bc8f659bd4509ed70e7062805a0bc0a5cbe5ff0 Mon Sep 17 00:00:00 2001 From: Michal Piotrowski Date: Tue, 4 Sep 2012 18:27:42 +0200 Subject: [PATCH 020/975] Cookie tests --- .../HttpFoundation/Tests/CookieTest.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php index 6a9948d62ab2d..721cc3cd9e77f 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/CookieTest.php @@ -79,6 +79,23 @@ public function testGetExpiresTime() $this->assertEquals(3600, $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date'); } + public function testConstructorWithDateTime() + { + $expire = new \DateTime(); + $cookie = new Cookie('foo', 'bar', $expire); + + $this->assertEquals($expire->format('U'), $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date'); + } + + public function testGetExpiresTimeWithStringValue() + { + $value = "+1 day"; + $cookie = new Cookie('foo', 'bar', $value); + $expire = strtotime($value); + + $this->assertEquals($expire, $cookie->getExpiresTime(), '->getExpiresTime() returns the expire date'); + } + public function testGetDomain() { $cookie = new Cookie('foo', 'bar', 3600, '/', '.myfoodomain.com'); From 8f467956c86df5363cbc67acfdcb96a2191e789a Mon Sep 17 00:00:00 2001 From: Michal Piotrowski Date: Tue, 4 Sep 2012 20:36:25 +0200 Subject: [PATCH 021/975] tests for HeaderBag --- .../HttpFoundation/Tests/HeaderBagTest.php | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php index bafccb2eba253..20d3603038cad 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/HeaderBagTest.php @@ -24,6 +24,49 @@ public function testConstructor() $this->assertTrue($bag->has('foo')); } + public function testToStringNull() + { + $bag = new HeaderBag(); + $this->assertEquals('', $bag->__toString()); + } + + public function testToStringNotNull() + { + $bag = new HeaderBag(array('foo' => 'bar')); + $this->assertEquals("Foo: bar\r\n", $bag->__toString()); + } + + public function testKeys() + { + $bag = new HeaderBag(array('foo' => 'bar')); + $keys = $bag->keys(); + $this->assertEquals("foo", $keys[0]); + } + + public function testGetDate() + { + $bag = new HeaderBag(array('foo' => 'Tue, 4 Sep 2012 20:00:00 +0200')); + $headerDate = $bag->getDate('foo'); + $this->assertInstanceOf('DateTime', $headerDate); + } + + /** + * @expectedException \RuntimeException + */ + public function testGetDateException() + { + $bag = new HeaderBag(array('foo' => 'Tue')); + $headerDate = $bag->getDate('foo'); + } + + public function testGetCacheControlHeader() + { + $bag = new HeaderBag(); + $bag->addCacheControlDirective('public', '#a'); + $this->assertTrue($bag->hasCacheControlDirective('public')); + $this->assertEquals('#a', $bag->getCacheControlDirective('public')); + } + /** * @covers Symfony\Component\HttpFoundation\HeaderBag::all */ From 7c5cfeb77603f56c0ae529e9d1430808979c8183 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Wed, 5 Sep 2012 06:36:05 +0200 Subject: [PATCH 022/975] [Routing] added test why #5238 is not that easy --- .../Component/Routing/Tests/Matcher/UrlMatcherTest.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php index 31069b2af7f11..eb18e5068dfeb 100644 --- a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php +++ b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php @@ -214,6 +214,15 @@ public function testMatchRegression() } } + public function testDefaultRequirementForOptionalVariables() + { + $coll = new RouteCollection(); + $coll->add('test', new Route('/{page}.{_format}', array('page' => 'index', '_format' => 'html'))); + + $matcher = new UrlMatcher($coll, new RequestContext()); + $this->assertEquals(array('page' => 'my-page', '_format' => 'xml', '_route' => 'test'), $matcher->match('/my-page.xml')); + } + public function testMatchingIsEager() { $coll = new RouteCollection(); From cba2a31e3631ab9043389f8f7df873da0e6c8f47 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 6 Sep 2012 12:12:45 +0200 Subject: [PATCH 023/975] bumped Symfony version to 2.2.0-DEV --- src/Symfony/Component/HttpKernel/Kernel.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 366d216d4a665..6a695c5f487b4 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -58,12 +58,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface protected $classes; protected $errorReportingLevel; - const VERSION = '2.1.0'; + const VERSION = '2.2.0-DEV'; const VERSION_ID = '20100'; const MAJOR_VERSION = '2'; - const MINOR_VERSION = '1'; + const MINOR_VERSION = '2'; const RELEASE_VERSION = '0'; - const EXTRA_VERSION = ''; + const EXTRA_VERSION = 'DEV'; /** * Constructor. From 16c1b015318b36cd5ee37355895acbd77f847068 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Sun, 5 Aug 2012 05:35:48 +0200 Subject: [PATCH 024/975] [Routing] fixed 4 bugs in the UrlGenerator --- .../Routing/Generator/UrlGenerator.php | 42 ++++++++---------- .../Tests/Generator/UrlGeneratorTest.php | 43 +++++++++++++++++-- 2 files changed, 58 insertions(+), 27 deletions(-) diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php index 18edd160dd597..307b5a588f842 100644 --- a/src/Symfony/Component/Routing/Generator/UrlGenerator.php +++ b/src/Symfony/Component/Routing/Generator/UrlGenerator.php @@ -23,6 +23,7 @@ * UrlGenerator generates a URL based on a set of routes. * * @author Fabien Potencier + * @author Tobias Schultze * * @api */ @@ -132,13 +133,10 @@ public function generate($name, $parameters = array(), $absolute = false) protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute) { $variables = array_flip($variables); - - $originParameters = $parameters; - $parameters = array_replace($this->context->getParameters(), $parameters); - $tparams = array_replace($defaults, $parameters); + $mergedParams = array_replace($this->context->getParameters(), $defaults, $parameters); // all params must be given - if ($diff = array_diff_key($variables, $tparams)) { + if ($diff = array_diff_key($variables, $mergedParams)) { throw new MissingMandatoryParametersException(sprintf('The "%s" route has some missing mandatory parameters ("%s").', $name, implode('", "', array_keys($diff)))); } @@ -146,30 +144,26 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa $optional = true; foreach ($tokens as $token) { if ('variable' === $token[0]) { - if (false === $optional || !array_key_exists($token[3], $defaults) || (isset($parameters[$token[3]]) && (string) $parameters[$token[3]] != (string) $defaults[$token[3]])) { - if (!$isEmpty = in_array($tparams[$token[3]], array(null, '', false), true)) { - // check requirement - if ($tparams[$token[3]] && !preg_match('#^'.$token[2].'$#', $tparams[$token[3]])) { - $message = sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given).', $token[3], $name, $token[2], $tparams[$token[3]]); - if ($this->strictRequirements) { - throw new InvalidParameterException($message); - } - - if ($this->logger) { - $this->logger->err($message); - } - - return null; + if (!$optional || !array_key_exists($token[3], $defaults) || (string) $mergedParams[$token[3]] !== (string) $defaults[$token[3]]) { + // check requirement + if (!preg_match('#^'.$token[2].'$#', $mergedParams[$token[3]])) { + $message = sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given).', $token[3], $name, $token[2], $mergedParams[$token[3]]); + if ($this->strictRequirements) { + throw new InvalidParameterException($message); + } + + if ($this->logger) { + $this->logger->err($message); } - } - if (!$isEmpty || !$optional) { - $url = $token[1].$tparams[$token[3]].$url; + return null; } + $url = $token[1].$mergedParams[$token[3]].$url; $optional = false; } - } elseif ('text' === $token[0]) { + } else { + // static text $url = $token[1].$url; $optional = false; } @@ -193,7 +187,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa } // add a query string if needed - $extra = array_diff_key($originParameters, $variables, $defaults); + $extra = array_diff_key($parameters, $variables); if ($extra && $query = http_build_query($extra, '', '&')) { $url .= '?'.$query; } diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php index f001067a5392f..236015f976c57 100644 --- a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php +++ b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php @@ -74,12 +74,15 @@ public function testRelativeUrlWithNullParameter() $this->assertEquals('/app.php/testing', $url); } + /** + * @expectedException Symfony\Component\Routing\Exception\InvalidParameterException + */ public function testRelativeUrlWithNullParameterButNotOptional() { $routes = $this->getRoutes('test', new Route('/testing/{foo}/bar', array('foo' => null))); - $url = $this->getGenerator($routes)->generate('test', array(), false); - - $this->assertEquals('/app.php/testing//bar', $url); + // This must raise an exception because the default requirement for "foo" is "[^/]+" which is not met with these params. + // Generating path "/testing//bar" would be wrong as matching this route would fail. + $this->getGenerator($routes)->generate('test', array(), false); } public function testRelativeUrlWithOptionalZeroParameter() @@ -90,6 +93,13 @@ public function testRelativeUrlWithOptionalZeroParameter() $this->assertEquals('/app.php/testing/0', $url); } + public function testNotPassedOptionalParameterInBetween() + { + $routes = $this->getRoutes('test', new Route('/{slug}/{page}', array('slug' => 'index', 'page' => 0))); + $this->assertSame('/app.php/index/1', $this->getGenerator($routes)->generate('test', array('page' => 1))); + $this->assertSame('/app.php/', $this->getGenerator($routes)->generate('test')); + } + public function testRelativeUrlWithExtraParameters() { $routes = $this->getRoutes('test', new Route('/testing')); @@ -165,6 +175,15 @@ public function testGenerateForRouteWithInvalidOptionalParameter() $this->getGenerator($routes)->generate('test', array('foo' => 'bar'), true); } + /** + * @expectedException Symfony\Component\Routing\Exception\InvalidParameterException + */ + public function testGenerateForRouteWithInvalidParameter() + { + $routes = $this->getRoutes('test', new Route('/testing/{foo}', array(), array('foo' => '1|2'))); + $this->getGenerator($routes)->generate('test', array('foo' => '0'), true); + } + public function testGenerateForRouteWithInvalidOptionalParameterNonStrict() { $routes = $this->getRoutes('test', new Route('/testing/{foo}', array('foo' => '1'), array('foo' => 'd+'))); @@ -196,6 +215,15 @@ public function testGenerateForRouteWithInvalidMandatoryParameter() $routes = $this->getRoutes('test', new Route('/testing/{foo}', array(), array('foo' => 'd+'))); $this->getGenerator($routes)->generate('test', array('foo' => 'bar'), true); } + + /** + * @expectedException Symfony\Component\Routing\Exception\InvalidParameterException + */ + public function testRequiredParamAndEmptyPassed() + { + $routes = $this->getRoutes('test', new Route('/{slug}', array(), array('slug' => '.+'))); + $this->getGenerator($routes)->generate('test', array('slug' => '')); + } public function testSchemeRequirementDoesNothingIfSameCurrentScheme() { @@ -229,6 +257,15 @@ public function testWithAnIntegerAsADefaultValue() $this->assertEquals('/app.php/foo', $this->getGenerator($routes)->generate('test', array('default' => 'foo'))); } + public function testQueryParamSameAsDefault() + { + $routes = $this->getRoutes('test', new Route('/test', array('default' => 'value'))); + + $this->assertSame('/app.php/test?default=foo', $this->getGenerator($routes)->generate('test', array('default' => 'foo'))); + $this->assertSame('/app.php/test?default=value', $this->getGenerator($routes)->generate('test', array('default' => 'value'))); + $this->assertSame('/app.php/test', $this->getGenerator($routes)->generate('test')); + } + public function testUrlEncoding() { // This tests the encoding of reserved characters that are used for delimiting of URI components (defined in RFC 3986) From 4dc197c3e1ea227e36cab7ea93877fa44ecc569b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 6 Sep 2012 20:45:30 +0200 Subject: [PATCH 025/975] udpated composer.json to 2.2 --- composer.json | 2 +- src/Symfony/Bridge/Doctrine/composer.json | 2 +- src/Symfony/Bridge/Monolog/composer.json | 2 +- src/Symfony/Bridge/Propel1/composer.json | 2 +- src/Symfony/Bridge/Swiftmailer/composer.json | 2 +- src/Symfony/Bridge/Twig/composer.json | 14 ++++++------ .../Bundle/FrameworkBundle/composer.json | 2 +- .../Bundle/SecurityBundle/composer.json | 2 +- src/Symfony/Bundle/TwigBundle/composer.json | 2 +- .../Bundle/WebProfilerBundle/composer.json | 2 +- .../Component/BrowserKit/composer.json | 8 +++---- .../Component/ClassLoader/composer.json | 4 ++-- src/Symfony/Component/Config/composer.json | 2 +- src/Symfony/Component/Console/composer.json | 2 +- .../Component/CssSelector/composer.json | 2 +- .../DependencyInjection/composer.json | 6 ++--- .../Component/DomCrawler/composer.json | 4 ++-- .../Component/EventDispatcher/composer.json | 4 ++-- .../Component/Filesystem/composer.json | 2 +- src/Symfony/Component/Finder/composer.json | 2 +- src/Symfony/Component/Form/composer.json | 12 +++++----- .../Component/HttpFoundation/composer.json | 2 +- .../Component/HttpKernel/composer.json | 22 +++++++++---------- src/Symfony/Component/Locale/composer.json | 2 +- .../Component/OptionsResolver/composer.json | 2 +- src/Symfony/Component/Process/composer.json | 2 +- src/Symfony/Component/Routing/composer.json | 8 +++---- src/Symfony/Component/Security/composer.json | 14 ++++++------ .../Component/Serializer/composer.json | 2 +- .../Component/Templating/composer.json | 2 +- .../Component/Translation/composer.json | 6 ++--- src/Symfony/Component/Validator/composer.json | 8 +++---- src/Symfony/Component/Yaml/composer.json | 2 +- 33 files changed, 76 insertions(+), 76 deletions(-) diff --git a/composer.json b/composer.json index 045d434556b20..37d1b3341d9a9 100644 --- a/composer.json +++ b/composer.json @@ -70,7 +70,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 33c6956320cbe..83533de1b9230 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -33,7 +33,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json index d0e36b525eda0..e5d959ed4edac 100644 --- a/src/Symfony/Bridge/Monolog/composer.json +++ b/src/Symfony/Bridge/Monolog/composer.json @@ -27,7 +27,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Bridge/Propel1/composer.json b/src/Symfony/Bridge/Propel1/composer.json index b3955bf85ccfd..c312d98e68da4 100644 --- a/src/Symfony/Bridge/Propel1/composer.json +++ b/src/Symfony/Bridge/Propel1/composer.json @@ -29,7 +29,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Bridge/Swiftmailer/composer.json b/src/Symfony/Bridge/Swiftmailer/composer.json index f3c8b55061e9b..560f1fe035ee1 100644 --- a/src/Symfony/Bridge/Swiftmailer/composer.json +++ b/src/Symfony/Bridge/Swiftmailer/composer.json @@ -29,7 +29,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index c7f42595a5b12..9e19140005921 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -20,12 +20,12 @@ "twig/twig": ">=1.9.1,<2.0-dev" }, "require-dev": { - "symfony/form": "2.1.*", - "symfony/routing": "2.1.*", - "symfony/templating": "2.1.*", - "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*", - "symfony/security": "2.1.*" + "symfony/form": "2.2.*", + "symfony/routing": "2.2.*", + "symfony/templating": "2.2.*", + "symfony/translation": "2.2.*", + "symfony/yaml": "2.2.*", + "symfony/security": "2.2.*" }, "suggest": { "symfony/form": "self.version", @@ -42,7 +42,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 4b48a97b8c299..d06ccc27ad054 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -43,7 +43,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index fb4c79b7b9e34..c7f32ec856740 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -26,7 +26,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index 4403206686a45..9dc49d2a22979 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -26,7 +26,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index edc5c8d708ec4..67ab2b048dc28 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -26,7 +26,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index f40ddfae25a25..8088fbb7b932d 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -17,11 +17,11 @@ ], "require": { "php": ">=5.3.3", - "symfony/dom-crawler": "2.1.*" + "symfony/dom-crawler": "2.2.*" }, "require-dev": { - "symfony/process": "2.1.*", - "symfony/css-selector": "2.1.*" + "symfony/process": "2.2.*", + "symfony/css-selector": "2.2.*" }, "suggest": { "symfony/process": "self.version" @@ -33,7 +33,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json index ccd9ba9bc7007..5a68c85e67dcf 100644 --- a/src/Symfony/Component/ClassLoader/composer.json +++ b/src/Symfony/Component/ClassLoader/composer.json @@ -20,7 +20,7 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/finder": "2.1.*" + "symfony/finder": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Component\\ClassLoader": "" } @@ -29,7 +29,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json index 7d809454abb14..cf7074b7ef382 100644 --- a/src/Symfony/Component/Config/composer.json +++ b/src/Symfony/Component/Config/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json index 4488bf6092dd1..a0f2b1e0943a1 100644 --- a/src/Symfony/Component/Console/composer.json +++ b/src/Symfony/Component/Console/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/CssSelector/composer.json b/src/Symfony/Component/CssSelector/composer.json index 285fade6f3b9d..f893e74d2772f 100644 --- a/src/Symfony/Component/CssSelector/composer.json +++ b/src/Symfony/Component/CssSelector/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index 81811c39a25b1..ae900cbd44357 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -19,8 +19,8 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/yaml": "2.1.*", - "symfony/config": "2.1.*" + "symfony/yaml": "2.2.*", + "symfony/config": "2.2.*" }, "suggest": { "symfony/yaml": "self.version", @@ -33,7 +33,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json index 2dfd795dcde16..9f5ef9ca46d21 100644 --- a/src/Symfony/Component/DomCrawler/composer.json +++ b/src/Symfony/Component/DomCrawler/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/css-selector": "2.1.*" + "symfony/css-selector": "2.2.*" }, "suggest": { "symfony/css-selector": "self.version" @@ -31,7 +31,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json index 93abadeaca771..9cca69216bd50 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/dependency-injection": "2.1.*" + "symfony/dependency-injection": "2.2.*" }, "suggest": { "symfony/dependency-injection": "self.version", @@ -32,7 +32,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Filesystem/composer.json b/src/Symfony/Component/Filesystem/composer.json index 82325ce29c93c..168cefb3e0677 100644 --- a/src/Symfony/Component/Filesystem/composer.json +++ b/src/Symfony/Component/Filesystem/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Finder/composer.json b/src/Symfony/Component/Finder/composer.json index aeac80eaf5a51..690fd427e3000 100644 --- a/src/Symfony/Component/Finder/composer.json +++ b/src/Symfony/Component/Finder/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index b0446c608c569..9b6797377f1c7 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -17,13 +17,13 @@ ], "require": { "php": ">=5.3.3", - "symfony/event-dispatcher": "2.1.*", - "symfony/locale": "2.1.*", - "symfony/options-resolver": "2.1.*" + "symfony/event-dispatcher": "2.2.*", + "symfony/locale": "2.2.*", + "symfony/options-resolver": "2.2.*" }, "require-dev": { - "symfony/validator": "2.1.*", - "symfony/http-foundation": "2.1.*" + "symfony/validator": "2.2.*", + "symfony/http-foundation": "2.2.*" }, "suggest": { "symfony/validator": "self.version", @@ -36,7 +36,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json index 91c23c24870f1..d10ef3180357e 100644 --- a/src/Symfony/Component/HttpFoundation/composer.json +++ b/src/Symfony/Component/HttpFoundation/composer.json @@ -28,7 +28,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 12ea499dfd658..b1d1c2c4d0176 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -17,18 +17,18 @@ ], "require": { "php": ">=5.3.3", - "symfony/event-dispatcher": "2.1.*", - "symfony/http-foundation": "2.1.*" + "symfony/event-dispatcher": "2.2.*", + "symfony/http-foundation": "2.2.*" }, "require-dev": { - "symfony/browser-kit": "2.1.*", - "symfony/class-loader": "2.1.*", - "symfony/config": "2.1.*", - "symfony/console": "2.1.*", - "symfony/dependency-injection": "2.1.*", - "symfony/finder": "2.1.*", - "symfony/process": "2.1.*", - "symfony/routing": "2.1.*" + "symfony/browser-kit": "2.2.*", + "symfony/class-loader": "2.2.*", + "symfony/config": "2.2.*", + "symfony/console": "2.2.*", + "symfony/dependency-injection": "2.2.*", + "symfony/finder": "2.2.*", + "symfony/process": "2.2.*", + "symfony/routing": "2.2.*" }, "suggest": { "symfony/browser-kit": "self.version", @@ -45,7 +45,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Locale/composer.json b/src/Symfony/Component/Locale/composer.json index ff051d656194b..c450797b1774a 100644 --- a/src/Symfony/Component/Locale/composer.json +++ b/src/Symfony/Component/Locale/composer.json @@ -28,7 +28,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/OptionsResolver/composer.json b/src/Symfony/Component/OptionsResolver/composer.json index 22a39a23e2d39..39ad60a68e15e 100644 --- a/src/Symfony/Component/OptionsResolver/composer.json +++ b/src/Symfony/Component/OptionsResolver/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Process/composer.json b/src/Symfony/Component/Process/composer.json index a9f85f1af895b..ea53b3c459abe 100644 --- a/src/Symfony/Component/Process/composer.json +++ b/src/Symfony/Component/Process/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index 09706a6ff3a53..88a2b1952e55b 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -19,9 +19,9 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/config": "2.1.*", - "symfony/yaml": "2.1.*", - "symfony/http-kernel": "2.1.*", + "symfony/config": "2.2.*", + "symfony/yaml": "2.2.*", + "symfony/http-kernel": "2.2.*", "doctrine/common": ">=2.2,<2.4-dev" }, "suggest": { @@ -36,7 +36,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index 0be7fd2a215e7..ce5d22878b5a7 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -17,14 +17,14 @@ ], "require": { "php": ">=5.3.3", - "symfony/event-dispatcher": "2.1.*", - "symfony/http-foundation": "2.1.*", - "symfony/http-kernel": "2.1.*" + "symfony/event-dispatcher": "2.2.*", + "symfony/http-foundation": "2.2.*", + "symfony/http-kernel": "2.2.*" }, "require-dev": { - "symfony/form": "2.1.*", - "symfony/routing": "2.1.*", - "symfony/validator": "2.1.*", + "symfony/form": "2.2.*", + "symfony/routing": "2.2.*", + "symfony/validator": "2.2.*", "doctrine/common": ">=2.2,<2.4-dev", "doctrine/dbal": ">=2.2,<2.4-dev" }, @@ -43,7 +43,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json index 1c8feb3050e6d..aa23f3839f773 100644 --- a/src/Symfony/Component/Serializer/composer.json +++ b/src/Symfony/Component/Serializer/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Templating/composer.json b/src/Symfony/Component/Templating/composer.json index 43b701b824b63..dcf589a2f75ec 100644 --- a/src/Symfony/Component/Templating/composer.json +++ b/src/Symfony/Component/Templating/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index 6bcf291611153..caa44e0b0e349 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -19,8 +19,8 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/config": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/config": "2.2.*", + "symfony/yaml": "2.2.*" }, "suggest": { "symfony/config": "self.version", @@ -33,7 +33,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 5fa51ed77673f..c016c07fede2f 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -19,9 +19,9 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/http-foundation": "2.1.*", - "symfony/locale": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/http-foundation": "2.2.*", + "symfony/locale": "2.2.*", + "symfony/yaml": "2.2.*" }, "suggest": { "doctrine/common": ">=2.1,<2.4-dev", @@ -35,7 +35,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json index 88460ce34b70d..13a9e23603e0d 100644 --- a/src/Symfony/Component/Yaml/composer.json +++ b/src/Symfony/Component/Yaml/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.2-dev" } } } From e22823bb7d6c0a4cd5fb9d5315144d35ecc1a0b2 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Fri, 7 Sep 2012 03:30:48 +0200 Subject: [PATCH 026/975] [Routing] context params should have higher priority than defaults fixes #5437 --- .../Component/Routing/Generator/UrlGenerator.php | 2 +- .../Routing/Tests/Generator/UrlGeneratorTest.php | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php index 307b5a588f842..23ac3d7904062 100644 --- a/src/Symfony/Component/Routing/Generator/UrlGenerator.php +++ b/src/Symfony/Component/Routing/Generator/UrlGenerator.php @@ -133,7 +133,7 @@ public function generate($name, $parameters = array(), $absolute = false) protected function doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $absolute) { $variables = array_flip($variables); - $mergedParams = array_replace($this->context->getParameters(), $defaults, $parameters); + $mergedParams = array_replace($defaults, $this->context->getParameters(), $parameters); // all params must be given if ($diff = array_diff_key($variables, $mergedParams)) { diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php index 236015f976c57..3e039c520d643 100644 --- a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php +++ b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php @@ -148,6 +148,18 @@ public function testUrlWithGlobalParameter() $this->assertEquals('/app.php/testing/bar', $url); } + public function testGlobalParameterHasHigherPriorityThanDefault() + { + $routes = $this->getRoutes('test', new Route('/{_locale}', array('_locale' => 'en'))); + $generator = $this->getGenerator($routes); + $context = new RequestContext('/app.php'); + $context->setParameter('_locale', 'de'); + $generator->setContext($context); + $url = $generator->generate('test', array()); + + $this->assertSame('/app.php/de', $url); + } + /** * @expectedException Symfony\Component\Routing\Exception\RouteNotFoundException */ From 622102e2e99cf6a87432669eaabc678137ac3120 Mon Sep 17 00:00:00 2001 From: boombatower Date: Fri, 7 Sep 2012 14:36:28 -0700 Subject: [PATCH 027/975] [Process] change all documentation type to callable --- src/Symfony/Component/Process/Process.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index cd1e8b42155a2..19fdb78823029 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -153,8 +153,8 @@ public function __destruct() * The STDOUT and STDERR are also available after the process is finished * via the getOutput() and getErrorOutput() methods. * - * @param Closure|string|array $callback A PHP callback to run whenever there is some - * output available on STDOUT or STDERR + * @param callable $callback A PHP callback to run whenever there is some + * output available on STDOUT or STDERR * * @return integer The exit status code * @@ -184,8 +184,8 @@ public function run($callback = null) * with true as a second parameter then the callback will get all data occurred * in (and since) the start call. * - * @param Closure|string|array $callback A PHP callback to run whenever there is some - * output available on STDOUT or STDERR + * @param callable $callback A PHP callback to run whenever there is some + * output available on STDOUT or STDERR * * @throws \RuntimeException When process can't be launch or is stopped * @throws \RuntimeException When process is already running @@ -307,7 +307,7 @@ public function start($callback = null) * from the output in real-time while writing the standard input to the process. * It allows to have feedback from the independent process during execution. * - * @param mixed $callback A valid PHP callback + * @param callable $callback A valid PHP callback * * @return int The exitcode of the process * @@ -684,7 +684,7 @@ public function setEnhanceWindowsCompatibility($enhance) * The callbacks adds all occurred output to the specific buffer and calls * the user callback (if present) with the received output. * - * @param mixed $callback The user defined PHP callback + * @param callable $callback The user defined PHP callback * * @return mixed A PHP callable */ @@ -746,7 +746,7 @@ protected function updateOutput() /** * Handles the windows file handles fallbacks * - * @param mixed $callback A valid PHP callback + * @param callable $callback A valid PHP callback * @param Boolean $closeEmptyHandles if true, handles that are empty will be assumed closed */ private function processFileHandles($callback, $closeEmptyHandles = false) From 13937de2c8b82ea37f2eb75c0b3b22d7d5d5bf7d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 10 Sep 2012 12:59:37 +0200 Subject: [PATCH 028/975] replaced self.version/2.1.* by 2.2.* in composer.json files --- src/Symfony/Bridge/Doctrine/composer.json | 4 +-- src/Symfony/Bridge/Monolog/composer.json | 2 +- src/Symfony/Bridge/Propel1/composer.json | 6 ++--- src/Symfony/Bridge/Swiftmailer/composer.json | 2 +- src/Symfony/Bridge/Twig/composer.json | 12 ++++----- .../Bundle/FrameworkBundle/composer.json | 26 +++++++++---------- .../Bundle/SecurityBundle/composer.json | 2 +- src/Symfony/Bundle/TwigBundle/composer.json | 2 +- .../Bundle/WebProfilerBundle/composer.json | 2 +- .../Component/BrowserKit/composer.json | 2 +- .../DependencyInjection/composer.json | 4 +-- .../Component/DomCrawler/composer.json | 2 +- .../Component/EventDispatcher/composer.json | 4 +-- src/Symfony/Component/Form/composer.json | 4 +-- .../Component/HttpKernel/composer.json | 12 ++++----- src/Symfony/Component/Routing/composer.json | 4 +-- src/Symfony/Component/Security/composer.json | 10 +++---- .../Component/Translation/composer.json | 4 +-- src/Symfony/Component/Validator/composer.json | 4 +-- 19 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index d1e0248fb0350..adc825d463070 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -20,8 +20,8 @@ "doctrine/common": ">=2.2,<2.4-dev" }, "suggest": { - "symfony/form": "2.1.*", - "symfony/validator": "2.1.*", + "symfony/form": "2.2.*", + "symfony/validator": "2.2.*", "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": ">=2.2,<2.4-dev", "doctrine/orm": ">=2.2.3,<2.4-dev" diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json index 9c39ec2e1d59a..2b60a451ee941 100644 --- a/src/Symfony/Bridge/Monolog/composer.json +++ b/src/Symfony/Bridge/Monolog/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/http-kernel": "2.1.*", + "symfony/http-kernel": "2.2.*", "monolog/monolog": "1.*" }, "autoload": { diff --git a/src/Symfony/Bridge/Propel1/composer.json b/src/Symfony/Bridge/Propel1/composer.json index 9219b32388c3f..7827d5e3874f6 100644 --- a/src/Symfony/Bridge/Propel1/composer.json +++ b/src/Symfony/Bridge/Propel1/composer.json @@ -17,9 +17,9 @@ ], "require": { "php": ">=5.3.3", - "symfony/http-foundation": "2.1.*", - "symfony/http-kernel": "2.1.*", - "symfony/form": "2.1.*", + "symfony/http-foundation": "2.2.*", + "symfony/http-kernel": "2.2.*", + "symfony/form": "2.2.*", "propel/propel1": "1.6.*" }, "autoload": { diff --git a/src/Symfony/Bridge/Swiftmailer/composer.json b/src/Symfony/Bridge/Swiftmailer/composer.json index 5995b79c0777f..c4dbd47793015 100644 --- a/src/Symfony/Bridge/Swiftmailer/composer.json +++ b/src/Symfony/Bridge/Swiftmailer/composer.json @@ -20,7 +20,7 @@ "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev" }, "suggest": { - "symfony/http-kernel": "2.1.*" + "symfony/http-kernel": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Bridge\\Swiftmailer": "" } diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index fcb4d946bf75b..8c9f13df4bb2e 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -28,12 +28,12 @@ "symfony/security": "2.2.*" }, "suggest": { - "symfony/form": "2.1.*", - "symfony/routing": "2.1.*", - "symfony/templating": "2.1.*", - "symfony/translation": "2.1.*", - "symfony/yaml": "2.1.*", - "symfony/security": "2.1.*" + "symfony/form": "2.2.*", + "symfony/routing": "2.2.*", + "symfony/templating": "2.2.*", + "symfony/translation": "2.2.*", + "symfony/yaml": "2.2.*", + "symfony/security": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Bridge\\Twig": "" } diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index e41d0005d1cf2..869dc5d153501 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -17,24 +17,24 @@ ], "require": { "php": ">=5.3.3", - "symfony/dependency-injection" : "2.1.*", - "symfony/config" : "2.1.*", - "symfony/event-dispatcher": "2.1.*", - "symfony/http-kernel": "2.1.*", - "symfony/filesystem": "2.1.*", - "symfony/routing": "2.1.*", - "symfony/templating": "2.1.*", - "symfony/translation": "2.1.*", + "symfony/dependency-injection" : "2.2.*", + "symfony/config" : "2.2.*", + "symfony/event-dispatcher": "2.2.*", + "symfony/http-kernel": "2.2.*", + "symfony/filesystem": "2.2.*", + "symfony/routing": "2.2.*", + "symfony/templating": "2.2.*", + "symfony/translation": "2.2.*", "doctrine/common": ">=2.2,<2.4-dev" }, "require-dev": { - "symfony/finder": "2.1.*" + "symfony/finder": "2.2.*" }, "suggest": { - "symfony/console": "2.1.*", - "symfony/finder": "2.1.*", - "symfony/form": "2.1.*", - "symfony/validator": "2.1.*" + "symfony/console": "2.2.*", + "symfony/finder": "2.2.*", + "symfony/form": "2.2.*", + "symfony/validator": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Bundle\\FrameworkBundle": "" } diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index 70e6a486580bb..e369a94813f7c 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/security": "2.1.*" + "symfony/security": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Bundle\\SecurityBundle": "" } diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index 62978d302247a..c263b0a165cb3 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/twig-bridge": "2.1.*" + "symfony/twig-bridge": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Bundle\\TwigBundle": "" } diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index 900880e275175..3c14ba5eebe7b 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "symfony/twig-bundle": "2.1.*" + "symfony/twig-bundle": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Bundle\\WebProfilerBundle": "" } diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index 47c657f934771..12ff0e041d5b9 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -24,7 +24,7 @@ "symfony/css-selector": "2.2.*" }, "suggest": { - "symfony/process": "2.1.*" + "symfony/process": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Component\\BrowserKit": "" } diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index f108829d3b469..b50f49b2a93cd 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -23,8 +23,8 @@ "symfony/config": "2.2.*" }, "suggest": { - "symfony/yaml": "2.1.*", - "symfony/config": "2.1.*" + "symfony/yaml": "2.2.*", + "symfony/config": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Component\\DependencyInjection": "" } diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json index b220622561230..80b1792b1aacc 100644 --- a/src/Symfony/Component/DomCrawler/composer.json +++ b/src/Symfony/Component/DomCrawler/composer.json @@ -22,7 +22,7 @@ "symfony/css-selector": "2.2.*" }, "suggest": { - "symfony/css-selector": "2.1.*" + "symfony/css-selector": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Component\\DomCrawler": "" } diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json index a706847e980e9..c31dd481e2d93 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -22,8 +22,8 @@ "symfony/dependency-injection": "2.2.*" }, "suggest": { - "symfony/dependency-injection": "2.1.*", - "symfony/http-kernel": "2.1.*" + "symfony/dependency-injection": "2.2.*", + "symfony/http-kernel": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Component\\EventDispatcher": "" } diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index bd5d58393b66a..e861e3b1d2b47 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -26,8 +26,8 @@ "symfony/http-foundation": "2.2.*" }, "suggest": { - "symfony/validator": "2.1.*", - "symfony/http-foundation": "2.1.*" + "symfony/validator": "2.2.*", + "symfony/http-foundation": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Component\\Form": "" } diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 6393185961816..7c9fe7dc308fa 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -31,12 +31,12 @@ "symfony/routing": "2.2.*" }, "suggest": { - "symfony/browser-kit": "2.1.*", - "symfony/class-loader": "2.1.*", - "symfony/config": "2.1.*", - "symfony/console": "2.1.*", - "symfony/dependency-injection": "2.1.*", - "symfony/finder": "2.1.*" + "symfony/browser-kit": "2.2.*", + "symfony/class-loader": "2.2.*", + "symfony/config": "2.2.*", + "symfony/console": "2.2.*", + "symfony/dependency-injection": "2.2.*", + "symfony/finder": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Component\\HttpKernel": "" } diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index d8f0e95e0ce4d..2cee345e274ec 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -25,8 +25,8 @@ "doctrine/common": ">=2.2,<2.4-dev" }, "suggest": { - "symfony/config": "2.1.*", - "symfony/yaml": "2.1.*", + "symfony/config": "2.2.*", + "symfony/yaml": "2.2.*", "doctrine/common": ">=2.2,<2.4-dev" }, "autoload": { diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index 26fea16f0b9fd..ceaf28036cae5 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -29,11 +29,11 @@ "doctrine/dbal": ">=2.2,<2.4-dev" }, "suggest": { - "symfony/class-loader": "2.1.*", - "symfony/finder": "2.1.*", - "symfony/form": "2.1.*", - "symfony/validator": "2.1.*", - "symfony/routing": "2.1.*", + "symfony/class-loader": "2.2.*", + "symfony/finder": "2.2.*", + "symfony/form": "2.2.*", + "symfony/validator": "2.2.*", + "symfony/routing": "2.2.*", "doctrine/dbal": "to use the built-in ACL implementation" }, "autoload": { diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index 41183c2a5de9b..dcc3c0e1a04e3 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -23,8 +23,8 @@ "symfony/yaml": "2.2.*" }, "suggest": { - "symfony/config": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/config": "2.2.*", + "symfony/yaml": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Component\\Translation": "" } diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index a4702c970f259..de1279e0a921f 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -25,8 +25,8 @@ }, "suggest": { "doctrine/common": ">=2.1,<2.4-dev", - "symfony/http-foundation": "2.1.*", - "symfony/yaml": "2.1.*" + "symfony/http-foundation": "2.2.*", + "symfony/yaml": "2.2.*" }, "autoload": { "psr-0": { "Symfony\\Component\\Validator": "" } From 005a9a3c5bd137acdec7f222a0e0dc101e513f41 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Tue, 8 May 2012 10:14:10 +0200 Subject: [PATCH 029/975] [Routing] fixed RouteCompiler for adjacent and nested placeholders --- .../Component/Routing/RouteCompiler.php | 77 ++++++++++++------- .../Tests/Generator/UrlGeneratorTest.php | 13 ++++ .../Routing/Tests/Matcher/UrlMatcherTest.php | 20 +++++ .../Routing/Tests/RouteCompilerTest.php | 20 +++++ 4 files changed, 104 insertions(+), 26 deletions(-) diff --git a/src/Symfony/Component/Routing/RouteCompiler.php b/src/Symfony/Component/Routing/RouteCompiler.php index 5c16813943534..76cd4f2df9c1b 100644 --- a/src/Symfony/Component/Routing/RouteCompiler.php +++ b/src/Symfony/Component/Routing/RouteCompiler.php @@ -15,6 +15,7 @@ * RouteCompiler compiles Route instances to CompiledRoute instances. * * @author Fabien Potencier + * @author Tobias Schultze */ class RouteCompiler implements RouteCompilerInterface { @@ -30,45 +31,50 @@ class RouteCompiler implements RouteCompilerInterface public function compile(Route $route) { $pattern = $route->getPattern(); - $len = strlen($pattern); $tokens = array(); $variables = array(); + $matches = array(); $pos = 0; - preg_match_all('#.\{(\w+)\}#', $pattern, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER); - foreach ($matches as $match) { - if ($text = substr($pattern, $pos, $match[0][1] - $pos)) { - $tokens[] = array('text', $text); - } + $lastSeparator = ''; + // Match all variables enclosed in "{}" and iterate over them. But we only want to match the innermost variable + // in case of nested "{}", e.g. {foo{bar}}. This in ensured because \w does not match "{" or "}" itself. + preg_match_all('#\{\w+\}#', $pattern, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER); + foreach ($matches as $match) { + $varName = substr($match[0][0], 1, -1); + // get all static text preceding the current variable + $precedingText = substr($pattern, $pos, $match[0][1] - $pos); $pos = $match[0][1] + strlen($match[0][0]); - $var = $match[1][0]; - - if (null !== $req = $route->getRequirement($var)) { - $regexp = $req; - } else { - // Use the character preceding the variable as a separator - $separators = array($match[0][0][0]); + $precedingChar = strlen($precedingText) > 0 ? substr($precedingText, -1) : ''; - if ($pos !== $len) { - // Use the character following the variable as the separator when available - $separators[] = $pattern[$pos]; - } - $regexp = sprintf('[^%s]+', preg_quote(implode('', array_unique($separators)), self::REGEX_DELIMITER)); + if (is_numeric($varName)) { + throw new \DomainException(sprintf('Variable name "%s" cannot be numeric in route pattern "%s". Please use a different name.', $varName, $pattern)); + } + if (in_array($varName, $variables)) { + throw new \LogicException(sprintf('Route pattern "%s" cannot reference variable name "%s" more than once.', $pattern, $varName)); } - $tokens[] = array('variable', $match[0][0][0], $regexp, $var); - - if (is_numeric($var)) { - throw new \DomainException(sprintf('Variable name "%s" cannot be numeric in route pattern "%s". Please use a different name.', $var, $route->getPattern())); + if (strlen($precedingText) > 1) { + $tokens[] = array('text', substr($precedingText, 0, -1)); } - if (in_array($var, $variables)) { - throw new \LogicException(sprintf('Route pattern "%s" cannot reference variable name "%s" more than once.', $route->getPattern(), $var)); + // use the character preceding the variable as a separator + // save it for later use as default separator for variables that follow directly without having a preceding char e.g. "/{x}{y}" + if ('' !== $precedingChar) { + $lastSeparator = $precedingChar; + } + + $regexp = $route->getRequirement($varName); + if (null === $regexp) { + // use the character following the variable (ignoring other placeholders) as a separator when it's not the same as the preceding separator + $nextSeparator = $this->findNextSeparator(substr($pattern, $pos)); + $regexp = sprintf('[^%s]+', preg_quote($lastSeparator !== $nextSeparator ? $lastSeparator.$nextSeparator : $lastSeparator, self::REGEX_DELIMITER)); } - $variables[] = $var; + $tokens[] = array('variable', $precedingChar, $regexp, $varName); + $variables[] = $varName; } - if ($pos < $len) { + if ($pos < strlen($pattern)) { $tokens[] = array('text', substr($pattern, $pos)); } @@ -97,6 +103,25 @@ public function compile(Route $route) ); } + /** + * Returns the next static character in the Route pattern that will serve as a separator. + * + * @param string $pattern The route pattern + * + * @return string The next static character (or empty string when none available) + */ + private function findNextSeparator($pattern) + { + if ('' == $pattern) { + // return empty string if pattern is empty or false (false which can be returned by substr) + return ''; + } + // first remove all placeholders from the pattern so we can find the next real static character + $pattern = preg_replace('#\{\w+\}#', '', $pattern); + + return isset($pattern[0]) ? $pattern[0] : ''; + } + /** * Computes the regexp used to match a specific token. It can be static text or a subpattern. * diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php index f001067a5392f..e40285defe944 100644 --- a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php +++ b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php @@ -255,6 +255,19 @@ public function testEncodingOfRelativePathSegments() $this->assertSame('/app.php/a./.a/a../..a/...', $this->getGenerator($routes)->generate('test')); } + public function testAdjacentVariables() + { + $routes = $this->getRoutes('test', new Route('/{x}{y}{z}.{_format}', array('z' => 'default-z', '_format' => 'html'), array('y' => '\d+'))); + $generator = $this->getGenerator($routes); + $this->assertSame('/app.php/foo123', $generator->generate('test', array('x' => 'foo', 'y' => '123'))); + $this->assertSame('/app.php/foo123bar.xml', $generator->generate('test', array('x' => 'foo', 'y' => '123', 'z' => 'bar', '_format' => 'xml'))); + + // The default requirement for 'x' should not allow the separator '.' in this case because it would otherwise match everything + // and following optional variables like _format could never match. + $this->setExpectedException('Symfony\Component\Routing\Exception\InvalidParameterException'); + $generator->generate('test', array('x' => 'do.t', 'y' => '123', 'z' => 'bar', '_format' => 'xml')); + } + protected function getGenerator(RouteCollection $routes, array $parameters = array(), $logger = null) { $context = new RequestContext('/app.php'); diff --git a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php index eb18e5068dfeb..2fde2d8864bff 100644 --- a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php +++ b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php @@ -232,6 +232,26 @@ public function testMatchingIsEager() $this->assertEquals(array('foo' => 'text1-text2-text3', 'bar' => 'text4', '_route' => 'test'), $matcher->match('/text1-text2-text3-text4-')); } + public function testAdjacentVariables() + { + $coll = new RouteCollection(); + $coll->add('test', new Route('/{w}{x}{y}{z}.{_format}', array('z' => 'default-z', '_format' => 'html'), array('y' => 'y|Y'))); + + $matcher = new UrlMatcher($coll, new RequestContext()); + // 'w' eagerly matches as much as possible and the other variables match the remaining chars. + // This also shows that the variables w-z must all exclude the separating char (the dot '.' in this case) by default requirement. + // Otherwise they would also comsume '.xml' and _format would never match as it's an optional variable. + $this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'Y', 'z' => 'Z','_format' => 'xml', '_route' => 'test'), $matcher->match('/wwwwwxYZ.xml')); + // As 'y' has custom requirement and can only be of value 'y|Y', it will leave 'ZZZ' to variable z. + // So with carefully chosen requirements adjacent variables, can be useful. + $this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'ZZZ','_format' => 'html', '_route' => 'test'), $matcher->match('/wwwwwxyZZZ')); + // z and _format are optional. + $this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'default-z','_format' => 'html', '_route' => 'test'), $matcher->match('/wwwwwxy')); + + $this->setExpectedException('Symfony\Component\Routing\Exception\ResourceNotFoundException'); + $matcher->match('/wxy.html'); + } + /** * @expectedException Symfony\Component\Routing\Exception\ResourceNotFoundException */ diff --git a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php index a71b4993ad267..284739c10a8d6 100644 --- a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php +++ b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php @@ -120,6 +120,26 @@ public function provideCompileData() array('text', '/foo'), )), + array( + 'Route with nested placeholders', + array('/{static{var}static}'), + '/{stati', '#^/\{static(?[^cs]+)static\}$#s', array('var'), array( + array('text', 'static}'), + array('variable', 'c', '[^cs]+', 'var'), + array('text', '/{stati'), + )), + + array( + 'Route without separator between variables', + array('/{w}{x}{y}{z}.{_format}', array('z' => 'default-z', '_format' => 'html'), array('y' => '(y|Y)')), + '', '#^/(?[^/\.]+)(?[^/\.]+)(?(y|Y))(?:(?[^/\.]+)(?:\.(?<_format>[^\.]+))?)?$#s', array('w', 'x', 'y', 'z', '_format'), array( + array('variable', '.', '[^\.]+', '_format'), + array('variable', '', '[^/\.]+', 'z'), + array('variable', '', '(y|Y)', 'y'), + array('variable', '', '[^/\.]+', 'x'), + array('variable', '/', '[^/\.]+', 'w'), + )), + array( 'Route with a format', array('/foo/{bar}.{_format}'), From 2a35941bab64b692104402c81fa5cd21283ad425 Mon Sep 17 00:00:00 2001 From: Michal Piotrowski Date: Tue, 11 Sep 2012 16:34:01 +0200 Subject: [PATCH 030/975] ParameterBag tests --- .../HttpFoundation/Tests/ParameterBagTest.php | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php index c3c0b16bfd5a6..6cd42bf91dd0f 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php @@ -32,6 +32,28 @@ public function testAll() $this->assertEquals(array('foo' => 'bar'), $bag->all(), '->all() gets all the input'); } + public function testKeys() + { + $bag = new ParameterBag(array('foo' => 'bar')); + $this->assertEquals(array('foo'), $bag->keys()); + } + + public function testAdd() + { + $bag = new ParameterBag(array('foo' => 'bar')); + $bag->add(array('bar' => 'bas')); + $this->assertEquals(array('foo' => 'bar', 'bar' => 'bas'), $bag->all()); + } + + public function testRemove() + { + $bag = new ParameterBag(array('foo' => 'bar')); + $bag->add(array('bar' => 'bas')); + $this->assertEquals(array('foo' => 'bar', 'bar' => 'bas'), $bag->all()); + $bag->remove('bar'); + $this->assertEquals(array('foo' => 'bar'), $bag->all()); + } + /** * @covers Symfony\Component\HttpFoundation\ParameterBag::replace */ From cc58b3092d62d14f2333f80f3e6ed68296688fea Mon Sep 17 00:00:00 2001 From: Arnaud Kleinpeter Date: Sat, 15 Sep 2012 18:15:43 +0200 Subject: [PATCH 031/975] [Console] Misuse of str_pad instead of str_repeat --- src/Symfony/Component/Console/Input/InputDefinition.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php index 2db9222f1e4fe..d93e8e3a0be3a 100644 --- a/src/Symfony/Component/Console/Input/InputDefinition.php +++ b/src/Symfony/Component/Console/Input/InputDefinition.php @@ -433,7 +433,7 @@ public function asText() $default = ''; } - $description = str_replace("\n", "\n".str_pad('', $max + 2, ' '), $argument->getDescription()); + $description = str_replace("\n", "\n".str_repeat(' ', $max + 2), $argument->getDescription()); $text[] = sprintf(" %-${max}s %s%s", $argument->getName(), $description, $default); } @@ -452,7 +452,7 @@ public function asText() } $multiple = $option->isArray() ? ' (multiple values allowed)' : ''; - $description = str_replace("\n", "\n".str_pad('', $max + 2, ' '), $option->getDescription()); + $description = str_replace("\n", "\n".str_repeat(' ', $max + 2), $option->getDescription()); $optionMax = $max - strlen($option->getName()) - 2; $text[] = sprintf(" %s %-${optionMax}s%s%s%s", From baf2c46a076ba2e62b880204c1eb19fcc00a8803 Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Sun, 16 Sep 2012 00:50:00 +0000 Subject: [PATCH 032/975] [Config] Little tweak --- src/Symfony/Component/Config/ConfigCache.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Config/ConfigCache.php b/src/Symfony/Component/Config/ConfigCache.php index 1a96bddd3c67d..780e8a0228b32 100644 --- a/src/Symfony/Component/Config/ConfigCache.php +++ b/src/Symfony/Component/Config/ConfigCache.php @@ -99,7 +99,7 @@ public function write($content, array $metadata = null) throw new \RuntimeException(sprintf('Unable to write in the %s directory', $dir)); } - $tmpFile = tempnam(dirname($this->file), basename($this->file)); + $tmpFile = tempnam($dir, basename($this->file)); if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $this->file)) { @chmod($this->file, 0666 & ~umask()); } else { @@ -108,7 +108,7 @@ public function write($content, array $metadata = null) if (null !== $metadata && true === $this->debug) { $file = $this->file.'.meta'; - $tmpFile = tempnam(dirname($file), basename($file)); + $tmpFile = tempnam($dir, basename($file)); if (false !== @file_put_contents($tmpFile, serialize($metadata)) && @rename($tmpFile, $file)) { @chmod($file, 0666 & ~umask()); } From bb2566c17dfd98cb1d6e7ec3d6a09dcac7d245f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Haso=C5=88?= Date: Wed, 12 Sep 2012 11:29:58 +0200 Subject: [PATCH 033/975] [Console] Console colorization is also provided by ConEmu on Windows --- src/Symfony/Component/Console/CHANGELOG.md | 5 +++++ src/Symfony/Component/Console/Output/StreamOutput.php | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Console/CHANGELOG.md b/src/Symfony/Component/Console/CHANGELOG.md index 79449d8237a6d..1a0457fc3dd81 100644 --- a/src/Symfony/Component/Console/CHANGELOG.md +++ b/src/Symfony/Component/Console/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2.1.2 +----- + + * added support for colorization on Windows via ConEmu + 2.1.0 ----- diff --git a/src/Symfony/Component/Console/Output/StreamOutput.php b/src/Symfony/Component/Console/Output/StreamOutput.php index e00d0655cdddb..bf869fa19f315 100644 --- a/src/Symfony/Component/Console/Output/StreamOutput.php +++ b/src/Symfony/Component/Console/Output/StreamOutput.php @@ -95,7 +95,7 @@ protected function doWrite($message, $newline) * * Colorization is disabled if not supported by the stream: * - * - windows without ansicon + * - windows without ansicon and ConEmu * - non tty consoles * * @return Boolean true if the stream supports colorization, false otherwise @@ -104,7 +104,7 @@ protected function hasColorSupport() { // @codeCoverageIgnoreStart if (DIRECTORY_SEPARATOR == '\\') { - return false !== getenv('ANSICON'); + return false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI'); } return function_exists('posix_isatty') && @posix_isatty($this->stream); From 91354311f0bd04dcc87736021fa2e0c203c832cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Haso=C5=88?= Date: Wed, 5 Sep 2012 10:02:54 +0200 Subject: [PATCH 034/975] [HttpKernel] Added support for WinCache in ConfigDataCollector --- src/Symfony/Component/HttpKernel/CHANGELOG.md | 5 +++ .../DataCollector/ConfigDataCollector.php | 35 ++++++++++++------- .../DataCollector/ConfigDataCollectorTest.php | 4 ++- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md index c27de87eca5d9..9863fe25ca677 100644 --- a/src/Symfony/Component/HttpKernel/CHANGELOG.md +++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2.1.2 +----- + + * added support for WinCache opcode cache in ConfigDataCollector + 2.1.0 ----- diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php index 81ede39ced0ea..97797a48f23b8 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php @@ -42,17 +42,18 @@ public function setKernel(KernelInterface $kernel) public function collect(Request $request, Response $response, \Exception $exception = null) { $this->data = array( - 'token' => $response->headers->get('X-Debug-Token'), - 'symfony_version' => Kernel::VERSION, - 'name' => isset($this->kernel) ? $this->kernel->getName() : 'n/a', - 'env' => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a', - 'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a', - 'php_version' => PHP_VERSION, - 'xdebug_enabled' => extension_loaded('xdebug'), - 'eaccel_enabled' => extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'), - 'apc_enabled' => extension_loaded('apc') && ini_get('apc.enabled'), - 'xcache_enabled' => extension_loaded('xcache') && ini_get('xcache.cacher'), - 'bundles' => array(), + 'token' => $response->headers->get('X-Debug-Token'), + 'symfony_version' => Kernel::VERSION, + 'name' => isset($this->kernel) ? $this->kernel->getName() : 'n/a', + 'env' => isset($this->kernel) ? $this->kernel->getEnvironment() : 'n/a', + 'debug' => isset($this->kernel) ? $this->kernel->isDebug() : 'n/a', + 'php_version' => PHP_VERSION, + 'xdebug_enabled' => extension_loaded('xdebug'), + 'eaccel_enabled' => extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'), + 'apc_enabled' => extension_loaded('apc') && ini_get('apc.enabled'), + 'xcache_enabled' => extension_loaded('xcache') && ini_get('xcache.cacher'), + 'wincache_enabled' => extension_loaded('wincache') && ini_get('wincache.ocenabled'), + 'bundles' => array(), ); if (isset($this->kernel)) { @@ -162,6 +163,16 @@ public function hasXCache() return $this->data['xcache_enabled']; } + /** + * Returns true if WinCache is enabled. + * + * @return Boolean true if WinCache is enabled, false otherwise + */ + public function hasWinCache() + { + return $this->data['wincache_enabled']; + } + /** * Returns true if any accelerator is enabled. * @@ -169,7 +180,7 @@ public function hasXCache() */ public function hasAccelerator() { - return $this->hasApc() || $this->hasEAccelerator() || $this->hasXCache(); + return $this->hasApc() || $this->hasEAccelerator() || $this->hasXCache() || $this->hasWinCache(); } public function getBundles() diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php index f517c12b2f92a..5a0166d39ec0a 100644 --- a/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/DataCollector/ConfigDataCollectorTest.php @@ -53,7 +53,9 @@ public function testCollect() || (extension_loaded('apc') && ini_get('apc.enabled')) || - (extension_loaded('xcache') && ini_get('xcache.cacher')))) { + (extension_loaded('xcache') && ini_get('xcache.cacher')) + || + (extension_loaded('wincache') && ini_get('wincache.ocenabled')))) { $this->assertTrue($c->hasAccelerator()); } else { $this->assertFalse($c->hasAccelerator()); From f6857d4075ba2d48df6860ab196074272ea78e96 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 18 Sep 2012 15:46:10 +0200 Subject: [PATCH 035/975] updated CHANGELOG --- src/Symfony/Component/Validator/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Symfony/Component/Validator/CHANGELOG.md b/src/Symfony/Component/Validator/CHANGELOG.md index 47687ba91a393..208325ac13a19 100644 --- a/src/Symfony/Component/Validator/CHANGELOG.md +++ b/src/Symfony/Component/Validator/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2.2.0 +----- + + * added a Luhn validator + 2.1.0 ----- From 71db836e1f27c5b2039a7c5c4346179f83ca783c Mon Sep 17 00:00:00 2001 From: Jeanmonod David Date: Tue, 12 Jun 2012 17:47:41 +0200 Subject: [PATCH 036/975] Better config validation handling for numerical values: * New node type Integer and Float * New expressions: min() and max() --- .../Builder/FloatNodeDefinition.php | 32 +++++++ .../Builder/IntegerNodeDefinition.php | 32 +++++++ .../Config/Definition/Builder/NodeBuilder.php | 26 ++++++ .../Builder/NumericNodeDefinition.php | 58 +++++++++++++ .../Component/Config/Definition/FloatNode.php | 44 ++++++++++ .../Config/Definition/IntegerNode.php | 39 +++++++++ .../Config/Definition/NumericNode.php | 56 +++++++++++++ .../Definition/Builder/ExprBuilderTest.php | 13 +-- .../Definition/Builder/NodeBuilderTest.php | 11 +++ .../Builder/NumericNodeDefinitionTest.php | 84 +++++++++++++++++++ .../Config/Tests/Definition/FloatNodeTest.php | 64 ++++++++++++++ .../Tests/Definition/IntegerNodeTest.php | 61 ++++++++++++++ 12 files changed, 514 insertions(+), 6 deletions(-) create mode 100644 src/Symfony/Component/Config/Definition/Builder/FloatNodeDefinition.php create mode 100644 src/Symfony/Component/Config/Definition/Builder/IntegerNodeDefinition.php create mode 100644 src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php create mode 100644 src/Symfony/Component/Config/Definition/FloatNode.php create mode 100644 src/Symfony/Component/Config/Definition/IntegerNode.php create mode 100644 src/Symfony/Component/Config/Definition/NumericNode.php create mode 100755 src/Symfony/Component/Config/Tests/Definition/Builder/NumericNodeDefinitionTest.php create mode 100644 src/Symfony/Component/Config/Tests/Definition/FloatNodeTest.php create mode 100644 src/Symfony/Component/Config/Tests/Definition/IntegerNodeTest.php diff --git a/src/Symfony/Component/Config/Definition/Builder/FloatNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/FloatNodeDefinition.php new file mode 100644 index 0000000000000..b8fc34d0ead41 --- /dev/null +++ b/src/Symfony/Component/Config/Definition/Builder/FloatNodeDefinition.php @@ -0,0 +1,32 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Config\Definition\Builder; + +use Symfony\Component\Config\Definition\FloatNode; + +/** + * This class provides a fluent interface for defining a float node. + * + * @author Jeanmonod David + */ +class FloatNodeDefinition extends NumericNodeDefinition +{ + /** + * Instantiate a Node + * + * @return FloatNode The node + */ + protected function instantiateNode() + { + return new FloatNode($this->name, $this->parent, $this->min, $this->max); + } +} diff --git a/src/Symfony/Component/Config/Definition/Builder/IntegerNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/IntegerNodeDefinition.php new file mode 100644 index 0000000000000..d3d6179276edf --- /dev/null +++ b/src/Symfony/Component/Config/Definition/Builder/IntegerNodeDefinition.php @@ -0,0 +1,32 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Config\Definition\Builder; + +use Symfony\Component\Config\Definition\IntegerNode; + +/** + * This class provides a fluent interface for defining an integer node. + * + * @author Jeanmonod David + */ +class IntegerNodeDefinition extends NumericNodeDefinition +{ + /** + * Instantiate a Node + * + * @return IntegerNode The node + */ + protected function instantiateNode() + { + return new IntegerNode($this->name, $this->parent, $this->min, $this->max); + } +} diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php index c960ac43a6c12..a53685a22e57c 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php @@ -31,6 +31,8 @@ public function __construct() 'variable' => __NAMESPACE__.'\\VariableNodeDefinition', 'scalar' => __NAMESPACE__.'\\ScalarNodeDefinition', 'boolean' => __NAMESPACE__.'\\BooleanNodeDefinition', + 'integer' => __NAMESPACE__.'\\IntegerNodeDefinition', + 'float' => __NAMESPACE__.'\\FloatNodeDefinition', 'array' => __NAMESPACE__.'\\ArrayNodeDefinition', 'enum' => __NAMESPACE__.'\\EnumNodeDefinition', ); @@ -86,6 +88,30 @@ public function booleanNode($name) return $this->node($name, 'boolean'); } + /** + * Creates a child integer node. + * + * @param string $name the name of the node + * + * @return IntegerNodeDefinition The child node + */ + public function integerNode($name) + { + return $this->node($name, 'integer'); + } + + /** + * Creates a child float node. + * + * @param string $name the name of the node + * + * @return FloatNodeDefinition The child node + */ + public function floatNode($name) + { + return $this->node($name, 'float'); + } + /** * Creates a child EnumNode. * diff --git a/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php new file mode 100644 index 0000000000000..54f6d86f6d910 --- /dev/null +++ b/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php @@ -0,0 +1,58 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Config\Definition\Builder; + +/** + * Abstract class that contain common code of integer and float node definition. + * + * @author David Jeanmonod + */ +abstract class NumericNodeDefinition extends ScalarNodeDefinition +{ + + protected $min; + protected $max; + + /** + * Ensure the value is smaller than the given reference + * + * @param mixed $max + * + * @return NumericNodeDefinition + */ + public function max($max) + { + if (isset($this->min) && $this->min > $max) { + throw new \InvalidArgumentException(sprintf('You cannot define a max(%s) as you already have a min(%s)', $max, $this->min)); + } + $this->max = $max; + + return $this; + } + + /** + * Ensure the value is bigger than the given reference + * + * @param mixed $min + * + * @return NumericNodeDefinition + */ + public function min($min) + { + if (isset($this->max) && $this->max < $min) { + throw new \InvalidArgumentException(sprintf('You cannot define a min(%s) as you already have a max(%s)', $min, $this->max)); + } + $this->min = $min; + + return $this; + } +} diff --git a/src/Symfony/Component/Config/Definition/FloatNode.php b/src/Symfony/Component/Config/Definition/FloatNode.php new file mode 100644 index 0000000000000..782bd8b708d90 --- /dev/null +++ b/src/Symfony/Component/Config/Definition/FloatNode.php @@ -0,0 +1,44 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Config\Definition; + +use Symfony\Component\Config\Definition\Exception\InvalidTypeException; + +/** + * This node represents a float value in the config tree. + * + * @author Jeanmonod David + */ +class FloatNode extends NumericNode +{ + /** + * {@inheritDoc} + */ + protected function validateType($value) + { + // Integers are also accepted, we just cast them + if (is_int($value)) { + $value = (float) $value; + } + + if (!is_float($value)) { + $ex = new InvalidTypeException(sprintf( + 'Invalid type for path "%s". Expected float, but got %s.', + $this->getPath(), + gettype($value) + )); + $ex->setPath($this->getPath()); + + throw $ex; + } + } +} diff --git a/src/Symfony/Component/Config/Definition/IntegerNode.php b/src/Symfony/Component/Config/Definition/IntegerNode.php new file mode 100644 index 0000000000000..7a5c394513e81 --- /dev/null +++ b/src/Symfony/Component/Config/Definition/IntegerNode.php @@ -0,0 +1,39 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Config\Definition; + +use Symfony\Component\Config\Definition\Exception\InvalidTypeException; + +/** + * This node represents an integer value in the config tree. + * + * @author Jeanmonod David + */ +class IntegerNode extends NumericNode +{ + /** + * {@inheritDoc} + */ + protected function validateType($value) + { + if (!is_int($value)) { + $ex = new InvalidTypeException(sprintf( + 'Invalid type for path "%s". Expected int, but got %s.', + $this->getPath(), + gettype($value) + )); + $ex->setPath($this->getPath()); + + throw $ex; + } + } +} diff --git a/src/Symfony/Component/Config/Definition/NumericNode.php b/src/Symfony/Component/Config/Definition/NumericNode.php new file mode 100644 index 0000000000000..88c0caa628d76 --- /dev/null +++ b/src/Symfony/Component/Config/Definition/NumericNode.php @@ -0,0 +1,56 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Config\Definition; + +use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException; + +/** + * This node represents a numeric value in the config tree + * + * @author David Jeanmonod + */ +class NumericNode extends ScalarNode +{ + protected $min; + protected $max; + + public function __construct($name, NodeInterface $parent = null, $min = null, $max = null) + { + parent::__construct($name, $parent); + $this->min = $min; + $this->max = $max; + } + + /** + * {@inheritDoc} + */ + protected function finalizeValue($value) + { + $value = parent::finalizeValue($value); + + $errorMsg = null; + if (isset($this->min) && $value < $this->min) { + $errorMsg = sprintf('The value %s is too small for path "%s". Should be greater than: %s', $value, $this->getPath(), $this->min); + } + if (isset($this->max) && $value > $this->max) { + $errorMsg = sprintf('The value %s is too big for path "%s". Should be less than: %s', $value, $this->getPath(), $this->max); + } + if (isset($errorMsg)) { + $ex = new InvalidConfigurationException($errorMsg); + $ex->setPath($this->getPath()); + throw $ex; + } + + return $value; + } + +} diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php index 7d4c72bb26b66..9c7b71902e11c 100644 --- a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php @@ -13,7 +13,6 @@ use Symfony\Component\Config\Definition\Builder\TreeBuilder; - class ExprBuilderTest extends \PHPUnit_Framework_TestCase { @@ -160,6 +159,7 @@ public function testThenUnsetExpression() protected function getTestBuilder() { $builder = new TreeBuilder(); + return $builder ->root('test') ->children() @@ -171,7 +171,7 @@ protected function getTestBuilder() /** * Close the validation process and finalize with the given config * @param TreeBuilder $testBuilder The tree builder to finalize - * @param array $config The config you want to use for the finalization, if nothing provided + * @param array $config The config you want to use for the finalization, if nothing provided * a simple array('key'=>'value') will be used * @return array The finalized config values */ @@ -191,7 +191,8 @@ protected function finalizeTestBuilder($testBuilder, $config=null) * @param $val The value that the closure must return * @return Closure */ - protected function returnClosure($val) { + protected function returnClosure($val) + { return function($v) use ($val) { return $val; }; @@ -199,9 +200,9 @@ protected function returnClosure($val) { /** * Assert that the given test builder, will return the given value - * @param mixed $value The value to test - * @param TreeBuilder $test The tree builder to finalize - * @param mixed $config The config values that new to be finalized + * @param mixed $value The value to test + * @param TreeBuilder $test The tree builder to finalize + * @param mixed $config The config values that new to be finalized */ protected function assertFinalizedValueIs($value, $treeBuilder, $config=null) { diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/NodeBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/NodeBuilderTest.php index c8295916908a3..8d0a845309947 100644 --- a/src/Symfony/Component/Config/Tests/Definition/Builder/NodeBuilderTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/Builder/NodeBuilderTest.php @@ -76,6 +76,17 @@ public function testNodeTypesAreNotCaseSensitive() $this->assertEquals(get_class($node1), get_class($node2)); } + + public function testNumericNodeCreation() + { + $builder = new NodeBuilder(); + + $node = $builder->integerNode('foo')->min(3)->max(5); + $this->assertEquals('Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition', get_class($node)); + + $node = $builder->floatNode('bar')->min(3.0)->max(5.0); + $this->assertEquals('Symfony\Component\Config\Definition\Builder\FloatNodeDefinition', get_class($node)); + } } class SomeNodeDefinition extends BaseVariableNodeDefinition diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/NumericNodeDefinitionTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/NumericNodeDefinitionTest.php new file mode 100755 index 0000000000000..0add0db5682cb --- /dev/null +++ b/src/Symfony/Component/Config/Tests/Definition/Builder/NumericNodeDefinitionTest.php @@ -0,0 +1,84 @@ +max(3)->min(4); + } + + /** + * @expectedException \InvalidArgumentException + * @expectedExceptionMessage You cannot define a max(2) as you already have a min(3) + */ + public function testIncoherentMaxAssertion() + { + $node = new NumericNodeDefinition('foo'); + $node->min(3)->max(2); + } + + /** + * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException + * @expectedExceptionMessage The value 4 is too small for path "foo". Should be greater than: 5 + */ + public function testIntegerMinAssertion() + { + $def = new IntegerNodeDefinition('foo'); + $def->min(5)->getNode()->finalize(4); + } + + /** + * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException + * @expectedExceptionMessage The value 4 is too big for path "foo". Should be less than: 3 + */ + public function testIntegerMaxAssertion() + { + $def = new IntegerNodeDefinition('foo'); + $def->max(3)->getNode()->finalize(4); + } + + public function testIntegerValidMinMaxAssertion() + { + $def = new IntegerNodeDefinition('foo'); + $node = $def->min(3)->max(7)->getNode(); + $this->assertEquals(4, $node->finalize(4)); + } + + /** + * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException + * @expectedExceptionMessage The value 400 is too small for path "foo". Should be greater than: 500 + */ + public function testFloatMinAssertion() + { + $def = new FloatNodeDefinition('foo'); + $def->min(5E2)->getNode()->finalize(4e2); + } + + /** + * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException + * @expectedExceptionMessage The value 4.3 is too big for path "foo". Should be less than: 0.3 + */ + public function testFloatMaxAssertion() + { + $def = new FloatNodeDefinition('foo'); + $def->max(0.3)->getNode()->finalize(4.3); + } + + public function testFloatValidMinMaxAssertion() + { + $def = new FloatNodeDefinition('foo'); + $node = $def->min(3.0)->max(7e2)->getNode(); + $this->assertEquals(4.5, $node->finalize(4.5)); + } +} diff --git a/src/Symfony/Component/Config/Tests/Definition/FloatNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/FloatNodeTest.php new file mode 100644 index 0000000000000..b91446e1c8c9c --- /dev/null +++ b/src/Symfony/Component/Config/Tests/Definition/FloatNodeTest.php @@ -0,0 +1,64 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Config\Tests\Definition; + +use Symfony\Component\Config\Definition\FloatNode; + +class FloatNodeTest extends \PHPUnit_Framework_TestCase +{ + /** + * @dataProvider getValidValues + */ + public function testNormalize($value) + { + $node = new FloatNode('test'); + $this->assertSame($value, $node->normalize($value)); + } + + public function getValidValues() + { + return array( + array(1798.0), + array(-678.987), + array(12.56E45), + array(0.0), + // Integer are accepted too, they will be cast + array(17), + array(-10), + array(0) + ); + } + + /** + * @dataProvider getInvalidValues + * @expectedException Symfony\Component\Config\Definition\Exception\InvalidTypeException + */ + public function testNormalizeThrowsExceptionOnInvalidValues($value) + { + $node = new FloatNode('test'); + $node->normalize($value); + } + + public function getInvalidValues() + { + return array( + array(null), + array(''), + array('foo'), + array(true), + array(false), + array(array()), + array(array('foo' => 'bar')), + array(new \stdClass()), + ); + } +} diff --git a/src/Symfony/Component/Config/Tests/Definition/IntegerNodeTest.php b/src/Symfony/Component/Config/Tests/Definition/IntegerNodeTest.php new file mode 100644 index 0000000000000..11d53153069fc --- /dev/null +++ b/src/Symfony/Component/Config/Tests/Definition/IntegerNodeTest.php @@ -0,0 +1,61 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Config\Tests\Definition; + +use Symfony\Component\Config\Definition\IntegerNode; + +class IntegerNodeTest extends \PHPUnit_Framework_TestCase +{ + /** + * @dataProvider getValidValues + */ + public function testNormalize($value) + { + $node = new IntegerNode('test'); + $this->assertSame($value, $node->normalize($value)); + } + + public function getValidValues() + { + return array( + array(1798), + array(-678), + array(0), + ); + } + + /** + * @dataProvider getInvalidValues + * @expectedException Symfony\Component\Config\Definition\Exception\InvalidTypeException + */ + public function testNormalizeThrowsExceptionOnInvalidValues($value) + { + $node = new IntegerNode('test'); + $node->normalize($value); + } + + public function getInvalidValues() + { + return array( + array(null), + array(''), + array('foo'), + array(true), + array(false), + array(0.0), + array(0.1), + array(array()), + array(array('foo' => 'bar')), + array(new \stdClass()), + ); + } +} From bafe89047fbad1dc12cde5e3b0a62de651cf6bfb Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 18 Sep 2012 16:33:46 +0200 Subject: [PATCH 037/975] [FrameworkBundle] changed Client::enableProfiler() behavior to fail silently when the profiler is not available (it makes it easier to write functional tests) --- src/Symfony/Bundle/FrameworkBundle/Client.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Client.php b/src/Symfony/Bundle/FrameworkBundle/Client.php index 3874573f90d74..ec4e4aa64789e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Client.php +++ b/src/Symfony/Bundle/FrameworkBundle/Client.php @@ -65,15 +65,13 @@ public function getProfile() /** * Enables the profiler for the very next request. * - * @throws \LogicException if the profiler is not configured in the service container + * If the profiler is not enabled, the call to this method does nothing. */ public function enableProfiler() { - if (!$this->kernel->getContainer()->has('profiler')) { - throw new \LogicException('You cannot enable the profiler as it is not configured in the service container.'); + if ($this->kernel->getContainer()->has('profiler')) { + $this->profiler = true; } - - $this->profiler = true; } /** From 22e9036f8ce7c08b38ef222e5e967e0da0c8b460 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 18 Sep 2012 16:34:09 +0200 Subject: [PATCH 038/975] updated CHANGELOG --- src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md index da9db7ca3ecc0..bcb3a0adc85f8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2.2.0 +----- + + * added Client::enableProfiler() + 2.1.0 ----- From f9467128ad321fca450c62acaff0c0d78fd8b91a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 18 Sep 2012 19:22:28 +0200 Subject: [PATCH 039/975] fixed CHANGELOG --- src/Symfony/Component/HttpKernel/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md index 9863fe25ca677..ae2e0f5bee548 100644 --- a/src/Symfony/Component/HttpKernel/CHANGELOG.md +++ b/src/Symfony/Component/HttpKernel/CHANGELOG.md @@ -1,7 +1,7 @@ CHANGELOG ========= -2.1.2 +2.2.0 ----- * added support for WinCache opcode cache in ConfigDataCollector From 3ae0b4731fa3a4433faa9e749546316b84211033 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 18 Sep 2012 19:29:43 +0200 Subject: [PATCH 040/975] fixed CHANGELOG --- src/Symfony/Component/Console/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Console/CHANGELOG.md b/src/Symfony/Component/Console/CHANGELOG.md index 1a0457fc3dd81..9d3466d70967e 100644 --- a/src/Symfony/Component/Console/CHANGELOG.md +++ b/src/Symfony/Component/Console/CHANGELOG.md @@ -1,7 +1,7 @@ CHANGELOG ========= -2.1.2 +2.2.0 ----- * added support for colorization on Windows via ConEmu From 05d8c4288cd174d82ea07105e2dfd523fa3a162e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 19 Sep 2012 05:59:05 +0200 Subject: [PATCH 041/975] [FrameworkBundle] fixed the typehint for Kernel on the Client class (refs #4897) --- src/Symfony/Bundle/FrameworkBundle/Client.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Client.php b/src/Symfony/Bundle/FrameworkBundle/Client.php index ec4e4aa64789e..46928d2f12415 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Client.php +++ b/src/Symfony/Bundle/FrameworkBundle/Client.php @@ -12,11 +12,13 @@ namespace Symfony\Bundle\FrameworkBundle; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\HttpKernel\HttpKernelInterface; +use Symfony\Component\HttpKernel\KernelInterface; use Symfony\Component\HttpKernel\Client as BaseClient; use Symfony\Component\HttpKernel\Profiler\Profile as HttpProfile; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\BrowserKit\History; +use Symfony\Component\BrowserKit\CookieJar; /** * Client simulates a browser and makes requests to a Kernel object. @@ -28,6 +30,14 @@ class Client extends BaseClient private $hasPerformedRequest = false; private $profiler = false; + /** + * @inheritdoc + */ + public function __construct(KernelInterface $kernel, array $server = array(), History $history = null, CookieJar $cookieJar = null) + { + parent::__construct($kernel, $server, $history, $cookieJar); + } + /** * Returns the container. * @@ -41,7 +51,7 @@ public function getContainer() /** * Returns the kernel. * - * @return HttpKernelInterface + * @return KernelInterface */ public function getKernel() { From be331ca7f2bab213e5997151bcdc89347bc356dc Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 19 Sep 2012 06:19:30 +0200 Subject: [PATCH 042/975] [FrameworkBundle] fixed functional tests --- .../Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php index affbeb93d3f6c..8cf0dfead75dc 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/WebTestCase.php @@ -60,7 +60,7 @@ protected static function createKernel(array $options = array()) return new $class( $options['test_case'], isset($options['root_config']) ? $options['root_config'] : 'config.yml', - isset($options['environment']) ? $options['environment'] : 'frameworkbundletest', + isset($options['environment']) ? $options['environment'] : 'frameworkbundletest'.strtolower($options['test_case']), isset($options['debug']) ? $options['debug'] : true ); } From b89e413a93682a6ce8f6cb3e5d533c7e945172a0 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 19 Sep 2012 02:35:24 +0200 Subject: [PATCH 043/975] [Process] Add output / error output incremental getters --- src/Symfony/Component/Process/Process.php | 41 +++++++++++++++++++ .../Process/Tests/AbstractProcessTest.php | 38 +++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index 699e2647c86b5..83155d80b1085 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -51,6 +51,8 @@ class Process private $pipes; private $process; private $status = self::STATUS_READY; + private $incrementalOutputOffset; + private $incrementalErrorOutputOffset; private $fileHandles; private $readBytes; @@ -205,6 +207,8 @@ public function start($callback = null) $this->stdout = ''; $this->stderr = ''; + $this->incrementalOutputOffset = 0; + $this->incrementalErrorOutputOffset = 0; $callback = $this->buildCallback($callback); //Fix for PHP bug #51800: reading from STDOUT pipe hangs forever on Windows if the output is too big. @@ -413,6 +417,24 @@ public function getOutput() return $this->stdout; } + /** + * Returns the output incrementally. + * + * In comparison with the getOutput method which always return the whole + * output, this one returns the new output since the last call. + * + * @return string The process output since the last call + */ + public function getIncrementalOutput() + { + $data = $this->getOutput(); + + $latest = substr($data, $this->incrementalOutputOffset); + $this->incrementalOutputOffset = strlen($data); + + return $latest; + } + /** * Returns the current error output of the process (STDERR). * @@ -427,6 +449,25 @@ public function getErrorOutput() return $this->stderr; } + /** + * Returns the errorOutput incrementally. + * + * In comparison with the getErrorOutput method which always return the + * whole error output, this one returns the new error output since the last + * call. + * + * @return string The process error output since the last call + */ + public function getIncrementalErrorOutput() + { + $data = $this->getErrorOutput(); + + $latest = substr($data, $this->incrementalErrorOutputOffset); + $this->incrementalErrorOutputOffset = strlen($data); + + return $latest; + } + /** * Returns the exit code returned by the process. * diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php index 1b443502bd0f3..a9b5009dd6e6c 100644 --- a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php +++ b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php @@ -88,6 +88,44 @@ public function testCallbackIsExecutedForOutput() $this->assertTrue($called, 'The callback should be executed with the output'); } + public function testGetErrorOutput() + { + $p = new Process(sprintf('php -r %s', escapeshellarg('ini_set(\'display_errors\',\'on\');$n=0;while($n<3){echo $a;$n++;}'))); + + $p->run(); + $this->assertEquals(3, preg_match_all('/PHP Notice/', $p->getErrorOutput(), $matches)); + } + + public function testGetIncrementalErrorOutput() + { + $p = new Process(sprintf('php -r %s', escapeshellarg('ini_set(\'display_errors\',\'on\');usleep(50000);$n=0;while($n<3){echo $a;$n++;}'))); + + $p->start(); + while($p->isRunning()) { + $this->assertLessThanOrEqual(1, preg_match_all('/PHP Notice/', $p->getIncrementalOutput(), $matches)); + usleep(20000); + } + } + + public function testGetOutput() + { + $p = new Process(sprintf('php -r %s', escapeshellarg('$n=0;while($n<3){echo \' foo \';$n++;}'))); + + $p->run(); + $this->assertEquals(3, preg_match_all('/foo/', $p->getOutput(), $matches)); + } + + public function testGetIncrementalOutput() + { + $p = new Process(sprintf('php -r %s', escapeshellarg('$n=0;while($n<3){echo \' foo \';usleep(50000);$n++;}'))); + + $p->start(); + while($p->isRunning()) { + $this->assertLessThanOrEqual(1, preg_match_all('/foo/', $p->getIncrementalOutput(), $matches)); + usleep(20000); + } + } + public function testExitCodeCommandFailed() { if (defined('PHP_WINDOWS_VERSION_BUILD')) { From c9029664ad3c307f81efa9d3322170a96fca9398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Haso=C5=88?= Date: Fri, 31 Aug 2012 15:38:13 +0200 Subject: [PATCH 044/975] [DomCrawler] Added ability to set file as raw path to file field --- src/Symfony/Component/DomCrawler/CHANGELOG.md | 6 ++++++ .../Component/DomCrawler/Field/FileFormField.php | 10 ++++++++++ .../DomCrawler/Tests/Field/FileFormFieldTest.php | 10 ++++++++++ 3 files changed, 26 insertions(+) diff --git a/src/Symfony/Component/DomCrawler/CHANGELOG.md b/src/Symfony/Component/DomCrawler/CHANGELOG.md index 50edf20d8a4ad..815162c146dd8 100644 --- a/src/Symfony/Component/DomCrawler/CHANGELOG.md +++ b/src/Symfony/Component/DomCrawler/CHANGELOG.md @@ -1,6 +1,12 @@ CHANGELOG ========= +2.2.0 +----- + + * added a way to set raw path to the file in FileFormField - necessary for + simulating HTTP requests + 2.1.0 ----- diff --git a/src/Symfony/Component/DomCrawler/Field/FileFormField.php b/src/Symfony/Component/DomCrawler/Field/FileFormField.php index 1bb08afde9300..a00e65613af95 100644 --- a/src/Symfony/Component/DomCrawler/Field/FileFormField.php +++ b/src/Symfony/Component/DomCrawler/Field/FileFormField.php @@ -76,6 +76,16 @@ public function setValue($value) $this->value = array('name' => $name, 'type' => '', 'tmp_name' => $value, 'error' => $error, 'size' => $size); } + /** + * Sets path to the file as string for simulating HTTP request + * + * @param string $path The path to the file + */ + public function setFilePath($path) + { + parent::setValue($path); + } + /** * Initializes the form field. * diff --git a/src/Symfony/Component/DomCrawler/Tests/Field/FileFormFieldTest.php b/src/Symfony/Component/DomCrawler/Tests/Field/FileFormFieldTest.php index 95937ca01cccb..ea3840a18dddb 100644 --- a/src/Symfony/Component/DomCrawler/Tests/Field/FileFormFieldTest.php +++ b/src/Symfony/Component/DomCrawler/Tests/Field/FileFormFieldTest.php @@ -84,4 +84,14 @@ public function testSetErrorCode() $this->assertTrue(true, '->setErrorCode() throws a \InvalidArgumentException if the error code is not valid'); } } + + public function testSetRawFilePath() + { + $node = $this->createNode('input', '', array('type' => 'file')); + $field = new FileFormField($node); + $field->setFilePath(__FILE__); + + $this->assertEquals(__FILE__, $field->getValue()); + } + } From 46d90ce845fd8165d5f57e16cc6ea9f059a161aa Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 20 Sep 2012 07:46:50 +0200 Subject: [PATCH 045/975] [Config] fixed CS --- .../Config/Definition/Builder/FloatNodeDefinition.php | 2 +- .../Config/Definition/Builder/IntegerNodeDefinition.php | 2 +- .../Config/Definition/Builder/NumericNodeDefinition.php | 9 ++++++--- src/Symfony/Component/Config/Definition/FloatNode.php | 6 +----- src/Symfony/Component/Config/Definition/IntegerNode.php | 6 +----- src/Symfony/Component/Config/Definition/NumericNode.php | 1 - .../Config/Tests/Definition/Builder/ExprBuilderTest.php | 4 ++-- .../Definition/Builder/NumericNodeDefinitionTest.php | 9 +++++++++ 8 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/Symfony/Component/Config/Definition/Builder/FloatNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/FloatNodeDefinition.php index b8fc34d0ead41..c0bed462bf385 100644 --- a/src/Symfony/Component/Config/Definition/Builder/FloatNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/FloatNodeDefinition.php @@ -21,7 +21,7 @@ class FloatNodeDefinition extends NumericNodeDefinition { /** - * Instantiate a Node + * Instantiates a Node. * * @return FloatNode The node */ diff --git a/src/Symfony/Component/Config/Definition/Builder/IntegerNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/IntegerNodeDefinition.php index d3d6179276edf..f6c3c147f3e6a 100644 --- a/src/Symfony/Component/Config/Definition/Builder/IntegerNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/IntegerNodeDefinition.php @@ -21,7 +21,7 @@ class IntegerNodeDefinition extends NumericNodeDefinition { /** - * Instantiate a Node + * Instantiates a Node. * * @return IntegerNode The node */ diff --git a/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php index 54f6d86f6d910..5b6e9550bf3cd 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/NumericNodeDefinition.php @@ -18,16 +18,17 @@ */ abstract class NumericNodeDefinition extends ScalarNodeDefinition { - protected $min; protected $max; /** - * Ensure the value is smaller than the given reference + * Ensures that the value is smaller than the given reference. * * @param mixed $max * * @return NumericNodeDefinition + * + * @throws \InvalidArgumentException when the constraint is inconsistent */ public function max($max) { @@ -40,11 +41,13 @@ public function max($max) } /** - * Ensure the value is bigger than the given reference + * Ensures that the value is bigger than the given reference. * * @param mixed $min * * @return NumericNodeDefinition + * + * @throws \InvalidArgumentException when the constraint is inconsistent */ public function min($min) { diff --git a/src/Symfony/Component/Config/Definition/FloatNode.php b/src/Symfony/Component/Config/Definition/FloatNode.php index 782bd8b708d90..17c570acaa795 100644 --- a/src/Symfony/Component/Config/Definition/FloatNode.php +++ b/src/Symfony/Component/Config/Definition/FloatNode.php @@ -31,11 +31,7 @@ protected function validateType($value) } if (!is_float($value)) { - $ex = new InvalidTypeException(sprintf( - 'Invalid type for path "%s". Expected float, but got %s.', - $this->getPath(), - gettype($value) - )); + $ex = new InvalidTypeException(sprintf('Invalid type for path "%s". Expected float, but got %s.', $this->getPath(), gettype($value))); $ex->setPath($this->getPath()); throw $ex; diff --git a/src/Symfony/Component/Config/Definition/IntegerNode.php b/src/Symfony/Component/Config/Definition/IntegerNode.php index 7a5c394513e81..dbc04122fadf0 100644 --- a/src/Symfony/Component/Config/Definition/IntegerNode.php +++ b/src/Symfony/Component/Config/Definition/IntegerNode.php @@ -26,11 +26,7 @@ class IntegerNode extends NumericNode protected function validateType($value) { if (!is_int($value)) { - $ex = new InvalidTypeException(sprintf( - 'Invalid type for path "%s". Expected int, but got %s.', - $this->getPath(), - gettype($value) - )); + $ex = new InvalidTypeException(sprintf('Invalid type for path "%s". Expected int, but got %s.', $this->getPath(), gettype($value))); $ex->setPath($this->getPath()); throw $ex; diff --git a/src/Symfony/Component/Config/Definition/NumericNode.php b/src/Symfony/Component/Config/Definition/NumericNode.php index 88c0caa628d76..df45f2ebefd46 100644 --- a/src/Symfony/Component/Config/Definition/NumericNode.php +++ b/src/Symfony/Component/Config/Definition/NumericNode.php @@ -52,5 +52,4 @@ protected function finalizeValue($value) return $value; } - } diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php index bea34dca4b46e..d30f3f3ff7d42 100644 --- a/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/Builder/ExprBuilderTest.php @@ -175,7 +175,7 @@ protected function getTestBuilder() * a simple array('key'=>'value') will be used * @return array The finalized config values */ - protected function finalizeTestBuilder($testBuilder, $config=null) + protected function finalizeTestBuilder($testBuilder, $config = null) { return $testBuilder ->end() @@ -205,7 +205,7 @@ protected function returnClosure($val) * @param TreeBuilder $treeBuilder The tree builder to finalize * @param mixed $config The config values that new to be finalized */ - protected function assertFinalizedValueIs($value, $treeBuilder, $config=null) + protected function assertFinalizedValueIs($value, $treeBuilder, $config = null) { $this->assertEquals(array('key'=>$value), $this->finalizeTestBuilder($treeBuilder, $config)); } diff --git a/src/Symfony/Component/Config/Tests/Definition/Builder/NumericNodeDefinitionTest.php b/src/Symfony/Component/Config/Tests/Definition/Builder/NumericNodeDefinitionTest.php index 0add0db5682cb..51af2d71a247c 100755 --- a/src/Symfony/Component/Config/Tests/Definition/Builder/NumericNodeDefinitionTest.php +++ b/src/Symfony/Component/Config/Tests/Definition/Builder/NumericNodeDefinitionTest.php @@ -1,5 +1,14 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + namespace Symfony\Component\Config\Tests\Definition\Builder; use Symfony\Component\Config\Definition\Builder\IntegerNodeDefinition as NumericNodeDefinition; From 496ed135e87d48f2b14fbe403f007c5186201bf3 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 20 Sep 2012 07:48:14 +0200 Subject: [PATCH 046/975] updated CHANGELOG --- src/Symfony/Component/Config/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Symfony/Component/Config/CHANGELOG.md b/src/Symfony/Component/Config/CHANGELOG.md index 27dd93111e56d..f6c219b1923fe 100644 --- a/src/Symfony/Component/Config/CHANGELOG.md +++ b/src/Symfony/Component/Config/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2.2.0 +----- + + * added numerical type handling for config definitions + 2.1.0 ----- From 6cbeff0ea9b1337b04b833ac46a95eb51d2ebdca Mon Sep 17 00:00:00 2001 From: Gunther Konig Date: Thu, 20 Sep 2012 11:09:17 +0300 Subject: [PATCH 047/975] use ->find instead of ->get in the help command to allow command aliases to be used (e.g. "./app/console help do:sc:ge") --- src/Symfony/Component/Console/Command/HelpCommand.php | 2 +- .../Component/Console/Tests/Command/HelpCommandTest.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php index 93c81045c704a..71e2e15df76a0 100644 --- a/src/Symfony/Component/Console/Command/HelpCommand.php +++ b/src/Symfony/Component/Console/Command/HelpCommand.php @@ -70,7 +70,7 @@ public function setCommand(Command $command) protected function execute(InputInterface $input, OutputInterface $output) { if (null === $this->command) { - $this->command = $this->getApplication()->get($input->getArgument('command_name')); + $this->command = $this->getApplication()->find($input->getArgument('command_name')); } if ($input->getOption('xml')) { diff --git a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php index 417eea1af9548..b62973d9d637e 100644 --- a/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php +++ b/src/Symfony/Component/Console/Tests/Command/HelpCommandTest.php @@ -22,6 +22,14 @@ public function testExecute() { $command = new HelpCommand(); + $application = new Application(); + $command->setApplication($application); + $commandTester = new CommandTester($command); + $commandTester->execute(array('command_name' => 'li')); + $this->assertRegExp('/list \[--xml\] \[--raw\] \[namespace\]/', $commandTester->getDisplay(), '->execute() returns a text help for the given command alias'); + + $command = new HelpCommand(); + $commandTester = new CommandTester($command); $command->setCommand(new ListCommand()); $commandTester->execute(array()); From 6bafe5a635ff9970c50309d285e53016d938d2be Mon Sep 17 00:00:00 2001 From: "Johannes M. Schmitt" Date: Thu, 20 Sep 2012 13:28:43 +0200 Subject: [PATCH 048/975] moved some code to the component --- .../Command/ConfigDumpReferenceCommand.php | 157 +--------------- .../Config/Definition/ReferenceDumper.php | 175 ++++++++++++++++++ 2 files changed, 178 insertions(+), 154 deletions(-) create mode 100644 src/Symfony/Component/Config/Definition/ReferenceDumper.php diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php index 36c0593a84ed6..3036bdbc04416 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php @@ -11,6 +11,7 @@ namespace Symfony\Bundle\FrameworkBundle\Command; +use Symfony\Component\Config\Definition\ReferenceDumper; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -26,8 +27,6 @@ */ class ConfigDumpReferenceCommand extends ContainerDebugCommand { - protected $output; - /** * @see Command */ @@ -61,7 +60,6 @@ protected function configure() */ protected function execute(InputInterface $input, OutputInterface $output) { - $this->output = $output; $bundles = $this->getContainer()->get('kernel')->getBundles(); $containerBuilder = $this->getContainerBuilder(); @@ -112,158 +110,9 @@ protected function execute(InputInterface $input, OutputInterface $output) '" should implement ConfigurationInterface in order to be dumpable'); } - $rootNode = $configuration->getConfigTreeBuilder()->buildTree(); - $output->writeln($message); - // root node - $this->outputNode($rootNode); - } - - /** - * Outputs a single config reference line - * - * @param string $text - * @param int $indent - */ - private function outputLine($text, $indent = 0) - { - $indent = strlen($text) + $indent; - - $format = '%'.$indent.'s'; - - $this->output->writeln(sprintf($format, $text)); - } - - private function outputArray(array $array, $depth) - { - $isIndexed = array_values($array) === $array; - - foreach ($array as $key => $value) { - if (is_array($value)) { - $val = ''; - } else { - $val = $value; - } - - if ($isIndexed) { - $this->outputLine('- '.$val, $depth * 4); - } else { - $this->outputLine(sprintf('%-20s %s', $key.':', $val), $depth * 4); - } - - if (is_array($value)) { - $this->outputArray($value, $depth + 1); - } - } - } - - /** - * @param NodeInterface $node - * @param int $depth - */ - private function outputNode(NodeInterface $node, $depth = 0) - { - $comments = array(); - $default = ''; - $defaultArray = null; - $children = null; - $example = $node->getExample(); - - // defaults - if ($node instanceof ArrayNode) { - $children = $node->getChildren(); - - if ($node instanceof PrototypedArrayNode) { - $prototype = $node->getPrototype(); - - if ($prototype instanceof ArrayNode) { - $children = $prototype->getChildren(); - } - - // check for attribute as key - if ($key = $node->getKeyAttribute()) { - $keyNode = new ArrayNode($key, $node); - $keyNode->setInfo('Prototype'); - - // add children - foreach ($children as $childNode) { - $keyNode->addChild($childNode); - } - $children = array($key => $keyNode); - } - } - - if (!$children) { - if ($node->hasDefaultValue() && count($defaultArray = $node->getDefaultValue())) { - $default = ''; - } elseif (!is_array($example)) { - $default = '[]'; - } - } - } else { - $default = '~'; - - if ($node->hasDefaultValue()) { - $default = $node->getDefaultValue(); - - if (true === $default) { - $default = 'true'; - } elseif (false === $default) { - $default = 'false'; - } elseif (null === $default) { - $default = '~'; - } - } - } - - // required? - if ($node->isRequired()) { - $comments[] = 'Required'; - } - - // example - if ($example && !is_array($example)) { - $comments[] = 'Example: '.$example; - } - - $default = (string) $default != '' ? ' '.$default : ''; - $comments = count($comments) ? '# '.implode(', ', $comments) : ''; - - $text = sprintf('%-20s %s %s', $node->getName().':', $default, $comments); - - if ($info = $node->getInfo()) { - $this->outputLine(''); - $this->outputLine('# '.$info, $depth * 4); - } - - $this->outputLine($text, $depth * 4); - - // output defaults - if ($defaultArray) { - $this->outputLine(''); - - $message = count($defaultArray) > 1 ? 'Defaults' : 'Default'; - - $this->outputLine('# '.$message.':', $depth * 4 + 4); - - $this->outputArray($defaultArray, $depth + 1); - } - - if (is_array($example)) { - $this->outputLine(''); - - $message = count($example) > 1 ? 'Examples' : 'Example'; - - $this->outputLine('# '.$message.':', $depth * 4 + 4); - - $this->outputArray($example, $depth + 1); - } - - if ($children) { - foreach ($children as $childNode) { - $this->outputNode($childNode, $depth + 1); - } - } + $dumper = new ReferenceDumper(); + $output->writeln($dumper->dump($configuration)); } } diff --git a/src/Symfony/Component/Config/Definition/ReferenceDumper.php b/src/Symfony/Component/Config/Definition/ReferenceDumper.php new file mode 100644 index 0000000000000..6c4312db109a1 --- /dev/null +++ b/src/Symfony/Component/Config/Definition/ReferenceDumper.php @@ -0,0 +1,175 @@ + + */ +class ReferenceDumper +{ + private $reference; + + public function dump(ConfigurationInterface $configuration) + { + return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree()); + } + + public function dumpNode(NodeInterface $node) + { + $this->reference = ''; + $this->writeNode($node); + $ref = $this->reference; + $this->reference = null; + + return $ref; + } + + /** + * @param int $depth + */ + private function writeNode(NodeInterface $node, $depth = 0) + { + $comments = array(); + $default = ''; + $defaultArray = null; + $children = null; + $example = $node->getExample(); + + // defaults + if ($node instanceof ArrayNode) { + $children = $node->getChildren(); + + if ($node instanceof PrototypedArrayNode) { + $prototype = $node->getPrototype(); + + if ($prototype instanceof ArrayNode) { + $children = $prototype->getChildren(); + } + + // check for attribute as key + if ($key = $node->getKeyAttribute()) { + $keyNode = new ArrayNode($key, $node); + $keyNode->setInfo('Prototype'); + + // add children + foreach ($children as $childNode) { + $keyNode->addChild($childNode); + } + $children = array($key => $keyNode); + } + } + + if (!$children) { + if ($node->hasDefaultValue() && count($defaultArray = $node->getDefaultValue())) { + $default = ''; + } elseif (!is_array($example)) { + $default = '[]'; + } + } + } else { + $default = '~'; + + if ($node->hasDefaultValue()) { + $default = $node->getDefaultValue(); + + if (true === $default) { + $default = 'true'; + } elseif (false === $default) { + $default = 'false'; + } elseif (null === $default) { + $default = '~'; + } + } + } + + // required? + if ($node->isRequired()) { + $comments[] = 'Required'; + } + + // example + if ($example && !is_array($example)) { + $comments[] = 'Example: '.$example; + } + + $default = (string) $default != '' ? ' '.$default : ''; + $comments = count($comments) ? '# '.implode(', ', $comments) : ''; + + $text = sprintf('%-20s %s %s', $node->getName().':', $default, $comments); + + if ($info = $node->getInfo()) { + $this->writeLine(''); + $this->writeLine('# '.$info, $depth * 4); + } + + $this->writeLine($text, $depth * 4); + + // output defaults + if ($defaultArray) { + $this->writeLine(''); + + $message = count($defaultArray) > 1 ? 'Defaults' : 'Default'; + + $this->writeLine('# '.$message.':', $depth * 4 + 4); + + $this->writeArray($defaultArray, $depth + 1); + } + + if (is_array($example)) { + $this->writeLine(''); + + $message = count($example) > 1 ? 'Examples' : 'Example'; + + $this->writeLine('# '.$message.':', $depth * 4 + 4); + + $this->writeArray($example, $depth + 1); + } + + if ($children) { + foreach ($children as $childNode) { + $this->writeNode($childNode, $depth + 1); + } + } + } + + /** + * Outputs a single config reference line + * + * @param string $text + * @param int $indent + */ + private function writeLine($text, $indent = 0) + { + $indent = strlen($text) + $indent; + $format = '%'.$indent.'s'; + + $this->reference .= sprintf($format, $text)."\n"; + } + + private function writeArray(array $array, $depth) + { + $isIndexed = array_values($array) === $array; + + foreach ($array as $key => $value) { + if (is_array($value)) { + $val = ''; + } else { + $val = $value; + } + + if ($isIndexed) { + $this->writeLine('- '.$val, $depth * 4); + } else { + $this->writeLine(sprintf('%-20s %s', $key.':', $val), $depth * 4); + } + + if (is_array($value)) { + $this->writeArray($value, $depth + 1); + } + } + } +} \ No newline at end of file From 3680cec3e88ca26c0b6dfb1d7aa0c65f19e7bc79 Mon Sep 17 00:00:00 2001 From: Christian Jul Jensen Date: Thu, 20 Sep 2012 17:53:59 +0200 Subject: [PATCH 049/975] Fix PSR-0 incompatibilty Having 2 classes in the same file breaks PSR-0 compability --- src/Symfony/Component/DomCrawler/Form.php | 201 +---------------- .../DomCrawler/FormFieldRegistry.php | 213 ++++++++++++++++++ 2 files changed, 214 insertions(+), 200 deletions(-) create mode 100644 src/Symfony/Component/DomCrawler/FormFieldRegistry.php diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php index 9106a232e9068..9730e3eb5984e 100644 --- a/src/Symfony/Component/DomCrawler/Form.php +++ b/src/Symfony/Component/DomCrawler/Form.php @@ -384,203 +384,4 @@ private function initialize() } } } -} - -class FormFieldRegistry -{ - private $fields = array(); - - private $base; - - /** - * Adds a field to the registry. - * - * @param FormField $field The field - * - * @throws \InvalidArgumentException when the name is malformed - */ - public function add(FormField $field) - { - $segments = $this->getSegments($field->getName()); - - $target =& $this->fields; - while ($segments) { - if (!is_array($target)) { - $target = array(); - } - $path = array_shift($segments); - if ('' === $path) { - $target =& $target[]; - } else { - $target =& $target[$path]; - } - } - $target = $field; - } - - /** - * Removes a field and its children from the registry. - * - * @param string $name The fully qualified name of the base field - * - * @throws \InvalidArgumentException when the name is malformed - */ - public function remove($name) - { - $segments = $this->getSegments($name); - $target =& $this->fields; - while (count($segments) > 1) { - $path = array_shift($segments); - if (!array_key_exists($path, $target)) { - return; - } - $target =& $target[$path]; - } - unset($target[array_shift($segments)]); - } - - /** - * Returns the value of the field and its children. - * - * @param string $name The fully qualified name of the field - * - * @return mixed The value of the field - * - * @throws \InvalidArgumentException when the name is malformed - * @throws \InvalidArgumentException if the field does not exist - */ - public function &get($name) - { - $segments = $this->getSegments($name); - $target =& $this->fields; - while ($segments) { - $path = array_shift($segments); - if (!array_key_exists($path, $target)) { - throw new \InvalidArgumentException(sprintf('Unreachable field "%s"', $path)); - } - $target =& $target[$path]; - } - - return $target; - } - - /** - * Tests whether the form has the given field. - * - * @param string $name The fully qualified name of the field - * - * @return Boolean Whether the form has the given field - */ - public function has($name) - { - try { - $this->get($name); - - return true; - } catch (\InvalidArgumentException $e) { - return false; - } - } - - /** - * Set the value of a field and its children. - * - * @param string $name The fully qualified name of the field - * @param mixed $value The value - * - * @throws \InvalidArgumentException when the name is malformed - * @throws \InvalidArgumentException if the field does not exist - */ - public function set($name, $value) - { - $target =& $this->get($name); - if (is_array($value)) { - $fields = self::create($name, $value); - foreach ($fields->all() as $k => $v) { - $this->set($k, $v); - } - } else { - $target->setValue($value); - } - } - - /** - * Returns the list of field with their value. - * - * @return array The list of fields as array((string) Fully qualified name => (mixed) value) - */ - public function all() - { - return $this->walk($this->fields, $this->base); - } - - /** - * Creates an instance of the class. - * - * This function is made private because it allows overriding the $base and - * the $values properties without any type checking. - * - * @param string $base The fully qualified name of the base field - * @param array $values The values of the fields - * - * @return FormFieldRegistry - */ - private static function create($base, array $values) - { - $registry = new static(); - $registry->base = $base; - $registry->fields = $values; - - return $registry; - } - - /** - * Transforms a PHP array in a list of fully qualified name / value. - * - * @param array $array The PHP array - * @param string $base The name of the base field - * @param array $output The initial values - * - * @return array The list of fields as array((string) Fully qualified name => (mixed) value) - */ - private function walk(array $array, $base = '', array &$output = array()) - { - foreach ($array as $k => $v) { - $path = empty($base) ? $k : sprintf("%s[%s]", $base, $k); - if (is_array($v)) { - $this->walk($v, $path, $output); - } else { - $output[$path] = $v; - } - } - - return $output; - } - - /** - * Splits a field name into segments as a web browser would do. - * - * - * getSegments('base[foo][3][]') = array('base', 'foo, '3', ''); - * - * - * @param string $name The name of the field - * - * @return array The list of segments - * - * @throws \InvalidArgumentException when the name is malformed - */ - private function getSegments($name) - { - if (preg_match('/^(?P[^[]+)(?P(\[.*)|$)/', $name, $m)) { - $segments = array($m['base']); - while (preg_match('/^\[(?P.*?)\](?P.*)$/', $m['extra'], $m)) { - $segments[] = $m['segment']; - } - - return $segments; - } - - throw new \InvalidArgumentException(sprintf('Malformed field path "%s"', $name)); - } -} +} \ No newline at end of file diff --git a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php new file mode 100644 index 0000000000000..967e36c2d3469 --- /dev/null +++ b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php @@ -0,0 +1,213 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\DomCrawler; + +use Symfony\Component\DomCrawler\Field\FormField; + +class FormFieldRegistry +{ + private $fields = array(); + + private $base; + + /** + * Adds a field to the registry. + * + * @param FormField $field The field + * + * @throws \InvalidArgumentException when the name is malformed + */ + public function add(FormField $field) + { + $segments = $this->getSegments($field->getName()); + + $target =& $this->fields; + while ($segments) { + if (!is_array($target)) { + $target = array(); + } + $path = array_shift($segments); + if ('' === $path) { + $target =& $target[]; + } else { + $target =& $target[$path]; + } + } + $target = $field; + } + + /** + * Removes a field and its children from the registry. + * + * @param string $name The fully qualified name of the base field + * + * @throws \InvalidArgumentException when the name is malformed + */ + public function remove($name) + { + $segments = $this->getSegments($name); + $target =& $this->fields; + while (count($segments) > 1) { + $path = array_shift($segments); + if (!array_key_exists($path, $target)) { + return; + } + $target =& $target[$path]; + } + unset($target[array_shift($segments)]); + } + + /** + * Returns the value of the field and its children. + * + * @param string $name The fully qualified name of the field + * + * @return mixed The value of the field + * + * @throws \InvalidArgumentException when the name is malformed + * @throws \InvalidArgumentException if the field does not exist + */ + public function &get($name) + { + $segments = $this->getSegments($name); + $target =& $this->fields; + while ($segments) { + $path = array_shift($segments); + if (!array_key_exists($path, $target)) { + throw new \InvalidArgumentException(sprintf('Unreachable field "%s"', $path)); + } + $target =& $target[$path]; + } + + return $target; + } + + /** + * Tests whether the form has the given field. + * + * @param string $name The fully qualified name of the field + * + * @return Boolean Whether the form has the given field + */ + public function has($name) + { + try { + $this->get($name); + + return true; + } catch (\InvalidArgumentException $e) { + return false; + } + } + + /** + * Set the value of a field and its children. + * + * @param string $name The fully qualified name of the field + * @param mixed $value The value + * + * @throws \InvalidArgumentException when the name is malformed + * @throws \InvalidArgumentException if the field does not exist + */ + public function set($name, $value) + { + $target =& $this->get($name); + if (is_array($value)) { + $fields = self::create($name, $value); + foreach ($fields->all() as $k => $v) { + $this->set($k, $v); + } + } else { + $target->setValue($value); + } + } + + /** + * Returns the list of field with their value. + * + * @return array The list of fields as array((string) Fully qualified name => (mixed) value) + */ + public function all() + { + return $this->walk($this->fields, $this->base); + } + + /** + * Creates an instance of the class. + * + * This function is made private because it allows overriding the $base and + * the $values properties without any type checking. + * + * @param string $base The fully qualified name of the base field + * @param array $values The values of the fields + * + * @return FormFieldRegistry + */ + private static function create($base, array $values) + { + $registry = new static(); + $registry->base = $base; + $registry->fields = $values; + + return $registry; + } + + /** + * Transforms a PHP array in a list of fully qualified name / value. + * + * @param array $array The PHP array + * @param string $base The name of the base field + * @param array $output The initial values + * + * @return array The list of fields as array((string) Fully qualified name => (mixed) value) + */ + private function walk(array $array, $base = '', array &$output = array()) + { + foreach ($array as $k => $v) { + $path = empty($base) ? $k : sprintf("%s[%s]", $base, $k); + if (is_array($v)) { + $this->walk($v, $path, $output); + } else { + $output[$path] = $v; + } + } + + return $output; + } + + /** + * Splits a field name into segments as a web browser would do. + * + * + * getSegments('base[foo][3][]') = array('base', 'foo, '3', ''); + * + * + * @param string $name The name of the field + * + * @return array The list of segments + * + * @throws \InvalidArgumentException when the name is malformed + */ + private function getSegments($name) + { + if (preg_match('/^(?P[^[]+)(?P(\[.*)|$)/', $name, $m)) { + $segments = array($m['base']); + while (preg_match('/^\[(?P.*?)\](?P.*)$/', $m['extra'], $m)) { + $segments[] = $m['segment']; + } + + return $segments; + } + + throw new \InvalidArgumentException(sprintf('Malformed field path "%s"', $name)); + } +} From 0d9d7bd4449af57e47c407b9843e5c35f0f170a1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 20 Sep 2012 21:58:11 +0200 Subject: [PATCH 050/975] added a comment --- src/Symfony/Component/DomCrawler/FormFieldRegistry.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php index 967e36c2d3469..43b45c6712a63 100644 --- a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php +++ b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php @@ -13,6 +13,9 @@ use Symfony\Component\DomCrawler\Field\FormField; +/** + * This is an internal class that must not be used directly. + */ class FormFieldRegistry { private $fields = array(); From 958c9768ea86011e5f080d53109611c7e6b7a409 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 21 Sep 2012 08:09:07 +0200 Subject: [PATCH 051/975] fixed CS --- .../Config/Definition/ReferenceDumper.php | 217 +++++++++--------- 1 file changed, 113 insertions(+), 104 deletions(-) diff --git a/src/Symfony/Component/Config/Definition/ReferenceDumper.php b/src/Symfony/Component/Config/Definition/ReferenceDumper.php index 6c4312db109a1..835307eeae1cf 100644 --- a/src/Symfony/Component/Config/Definition/ReferenceDumper.php +++ b/src/Symfony/Component/Config/Definition/ReferenceDumper.php @@ -1,5 +1,14 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + namespace Symfony\Component\Config\Definition; /** @@ -18,7 +27,7 @@ public function dump(ConfigurationInterface $configuration) return $this->dumpNode($configuration->getConfigTreeBuilder()->buildTree()); } - public function dumpNode(NodeInterface $node) + public function dumpNode(NodeInterface $node) { $this->reference = ''; $this->writeNode($node); @@ -32,108 +41,108 @@ public function dumpNode(NodeInterface $node) * @param int $depth */ private function writeNode(NodeInterface $node, $depth = 0) - { - $comments = array(); - $default = ''; - $defaultArray = null; - $children = null; - $example = $node->getExample(); - - // defaults - if ($node instanceof ArrayNode) { - $children = $node->getChildren(); - - if ($node instanceof PrototypedArrayNode) { - $prototype = $node->getPrototype(); - - if ($prototype instanceof ArrayNode) { - $children = $prototype->getChildren(); - } - - // check for attribute as key - if ($key = $node->getKeyAttribute()) { - $keyNode = new ArrayNode($key, $node); - $keyNode->setInfo('Prototype'); - - // add children - foreach ($children as $childNode) { - $keyNode->addChild($childNode); - } - $children = array($key => $keyNode); - } - } - - if (!$children) { - if ($node->hasDefaultValue() && count($defaultArray = $node->getDefaultValue())) { - $default = ''; - } elseif (!is_array($example)) { - $default = '[]'; - } - } - } else { - $default = '~'; - - if ($node->hasDefaultValue()) { - $default = $node->getDefaultValue(); - - if (true === $default) { - $default = 'true'; - } elseif (false === $default) { - $default = 'false'; - } elseif (null === $default) { - $default = '~'; - } - } - } - - // required? - if ($node->isRequired()) { - $comments[] = 'Required'; - } - - // example - if ($example && !is_array($example)) { - $comments[] = 'Example: '.$example; - } - - $default = (string) $default != '' ? ' '.$default : ''; - $comments = count($comments) ? '# '.implode(', ', $comments) : ''; - - $text = sprintf('%-20s %s %s', $node->getName().':', $default, $comments); - - if ($info = $node->getInfo()) { - $this->writeLine(''); - $this->writeLine('# '.$info, $depth * 4); - } - - $this->writeLine($text, $depth * 4); - - // output defaults - if ($defaultArray) { - $this->writeLine(''); - - $message = count($defaultArray) > 1 ? 'Defaults' : 'Default'; - - $this->writeLine('# '.$message.':', $depth * 4 + 4); - - $this->writeArray($defaultArray, $depth + 1); - } - - if (is_array($example)) { - $this->writeLine(''); - - $message = count($example) > 1 ? 'Examples' : 'Example'; - - $this->writeLine('# '.$message.':', $depth * 4 + 4); - - $this->writeArray($example, $depth + 1); - } - - if ($children) { - foreach ($children as $childNode) { - $this->writeNode($childNode, $depth + 1); - } - } + { + $comments = array(); + $default = ''; + $defaultArray = null; + $children = null; + $example = $node->getExample(); + + // defaults + if ($node instanceof ArrayNode) { + $children = $node->getChildren(); + + if ($node instanceof PrototypedArrayNode) { + $prototype = $node->getPrototype(); + + if ($prototype instanceof ArrayNode) { + $children = $prototype->getChildren(); + } + + // check for attribute as key + if ($key = $node->getKeyAttribute()) { + $keyNode = new ArrayNode($key, $node); + $keyNode->setInfo('Prototype'); + + // add children + foreach ($children as $childNode) { + $keyNode->addChild($childNode); + } + $children = array($key => $keyNode); + } + } + + if (!$children) { + if ($node->hasDefaultValue() && count($defaultArray = $node->getDefaultValue())) { + $default = ''; + } elseif (!is_array($example)) { + $default = '[]'; + } + } + } else { + $default = '~'; + + if ($node->hasDefaultValue()) { + $default = $node->getDefaultValue(); + + if (true === $default) { + $default = 'true'; + } elseif (false === $default) { + $default = 'false'; + } elseif (null === $default) { + $default = '~'; + } + } + } + + // required? + if ($node->isRequired()) { + $comments[] = 'Required'; + } + + // example + if ($example && !is_array($example)) { + $comments[] = 'Example: '.$example; + } + + $default = (string) $default != '' ? ' '.$default : ''; + $comments = count($comments) ? '# '.implode(', ', $comments) : ''; + + $text = sprintf('%-20s %s %s', $node->getName().':', $default, $comments); + + if ($info = $node->getInfo()) { + $this->writeLine(''); + $this->writeLine('# '.$info, $depth * 4); + } + + $this->writeLine($text, $depth * 4); + + // output defaults + if ($defaultArray) { + $this->writeLine(''); + + $message = count($defaultArray) > 1 ? 'Defaults' : 'Default'; + + $this->writeLine('# '.$message.':', $depth * 4 + 4); + + $this->writeArray($defaultArray, $depth + 1); + } + + if (is_array($example)) { + $this->writeLine(''); + + $message = count($example) > 1 ? 'Examples' : 'Example'; + + $this->writeLine('# '.$message.':', $depth * 4 + 4); + + $this->writeArray($example, $depth + 1); + } + + if ($children) { + foreach ($children as $childNode) { + $this->writeNode($childNode, $depth + 1); + } + } } /** @@ -172,4 +181,4 @@ private function writeArray(array $array, $depth) } } } -} \ No newline at end of file +} From e0c001b772dd30b80bee6829e0686a4b7dca8116 Mon Sep 17 00:00:00 2001 From: nervo Date: Sun, 23 Sep 2012 10:54:29 +0300 Subject: [PATCH 052/975] Update src/Symfony/Component/Security/Http/Firewall/UsernamePasswordFormAuthenticationListener.php Better consistency in request method checking (See L.58) --- .../Firewall/UsernamePasswordFormAuthenticationListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordFormAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordFormAuthenticationListener.php index 22330a8c43cac..057ff7141ab20 100644 --- a/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordFormAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/UsernamePasswordFormAuthenticationListener.php @@ -67,7 +67,7 @@ protected function requiresAuthentication(Request $request) */ protected function attemptAuthentication(Request $request) { - if ($this->options['post_only'] && 'post' !== strtolower($request->getMethod())) { + if ($this->options['post_only'] && !$request->isMethod('post')) { if (null !== $this->logger) { $this->logger->debug(sprintf('Authentication method not supported: %s.', $request->getMethod())); } From 58cb6f55ccb3332595b46764d12482bfb0507781 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 23 Sep 2012 15:11:53 +0200 Subject: [PATCH 053/975] changed comparison on the request method to use the isMethod() method --- src/Symfony/Component/HttpFoundation/Response.php | 2 +- src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index dbc82d1b61bc0..6c9d715416e2c 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -231,7 +231,7 @@ public function prepare(Request $request) $headers->remove('Content-Length'); } - if ('HEAD' === $request->getMethod()) { + if ($request->isMethod('HEAD')) { // cf. RFC2616 14.13 $length = $headers->get('Content-Length'); $this->setContent(null); diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php index ec66dcd5fcbee..d5d6f3a4d93dc 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php @@ -580,7 +580,7 @@ protected function store(Request $request, Response $response) */ private function restoreResponseBody(Request $request, Response $response) { - if ('HEAD' === $request->getMethod() || 304 === $response->getStatusCode()) { + if ($request->isMethod('HEAD') || 304 === $response->getStatusCode()) { $response->setContent(null); $response->headers->remove('X-Body-Eval'); $response->headers->remove('X-Body-File'); From 45bf52358e8708f3e666d03d39bddd7fe3caf8e8 Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Fri, 28 Sep 2012 09:34:16 +0200 Subject: [PATCH 054/975] Optimize autoload prefix in composer.json By having more specific autoload prefixes it is possible to reduce the number of stat calls made. Also it prevents conflicts with similar namespaces. --- composer.json | 2 +- src/Symfony/Bridge/Doctrine/composer.json | 2 +- src/Symfony/Bridge/Monolog/composer.json | 2 +- src/Symfony/Bridge/Propel1/composer.json | 2 +- src/Symfony/Bridge/Swiftmailer/composer.json | 2 +- src/Symfony/Bridge/Twig/composer.json | 2 +- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- src/Symfony/Bundle/SecurityBundle/composer.json | 2 +- src/Symfony/Bundle/TwigBundle/composer.json | 2 +- src/Symfony/Bundle/WebProfilerBundle/composer.json | 2 +- src/Symfony/Component/BrowserKit/composer.json | 2 +- src/Symfony/Component/ClassLoader/composer.json | 2 +- src/Symfony/Component/Config/composer.json | 2 +- src/Symfony/Component/Console/composer.json | 2 +- src/Symfony/Component/CssSelector/composer.json | 2 +- src/Symfony/Component/DependencyInjection/composer.json | 2 +- src/Symfony/Component/DomCrawler/composer.json | 2 +- src/Symfony/Component/EventDispatcher/composer.json | 2 +- src/Symfony/Component/Filesystem/composer.json | 2 +- src/Symfony/Component/Finder/composer.json | 2 +- src/Symfony/Component/Form/composer.json | 2 +- src/Symfony/Component/HttpFoundation/composer.json | 2 +- src/Symfony/Component/HttpKernel/composer.json | 2 +- src/Symfony/Component/Locale/composer.json | 2 +- src/Symfony/Component/OptionsResolver/composer.json | 2 +- src/Symfony/Component/Process/composer.json | 2 +- src/Symfony/Component/Routing/composer.json | 2 +- src/Symfony/Component/Security/composer.json | 2 +- src/Symfony/Component/Serializer/composer.json | 2 +- src/Symfony/Component/Templating/composer.json | 2 +- src/Symfony/Component/Translation/composer.json | 2 +- src/Symfony/Component/Validator/composer.json | 2 +- src/Symfony/Component/Yaml/composer.json | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/composer.json b/composer.json index 37d1b3341d9a9..f1cb8feab4067 100644 --- a/composer.json +++ b/composer.json @@ -63,7 +63,7 @@ }, "autoload": { "psr-0": { - "Symfony": "src/", + "Symfony\\": "src/", "SessionHandlerInterface": "src/Symfony/Component/HttpFoundation/Resources/stubs" } }, diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index adc825d463070..325c335e3e4df 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -27,7 +27,7 @@ "doctrine/orm": ">=2.2.3,<2.4-dev" }, "autoload": { - "psr-0": { "Symfony\\Bridge\\Doctrine": "" } + "psr-0": { "Symfony\\Bridge\\Doctrine\\": "" } }, "target-dir": "Symfony/Bridge/Doctrine", "minimum-stability": "dev", diff --git a/src/Symfony/Bridge/Monolog/composer.json b/src/Symfony/Bridge/Monolog/composer.json index 2b60a451ee941..b41701a305e69 100644 --- a/src/Symfony/Bridge/Monolog/composer.json +++ b/src/Symfony/Bridge/Monolog/composer.json @@ -21,7 +21,7 @@ "monolog/monolog": "1.*" }, "autoload": { - "psr-0": { "Symfony\\Bridge\\Monolog": "" } + "psr-0": { "Symfony\\Bridge\\Monolog\\": "" } }, "target-dir": "Symfony/Bridge/Monolog", "minimum-stability": "dev", diff --git a/src/Symfony/Bridge/Propel1/composer.json b/src/Symfony/Bridge/Propel1/composer.json index 7827d5e3874f6..b4fb61284aedb 100644 --- a/src/Symfony/Bridge/Propel1/composer.json +++ b/src/Symfony/Bridge/Propel1/composer.json @@ -23,7 +23,7 @@ "propel/propel1": "1.6.*" }, "autoload": { - "psr-0": { "Symfony\\Bridge\\Propel1": "" } + "psr-0": { "Symfony\\Bridge\\Propel1\\": "" } }, "target-dir": "Symfony/Bridge/Propel1", "minimum-stability": "dev", diff --git a/src/Symfony/Bridge/Swiftmailer/composer.json b/src/Symfony/Bridge/Swiftmailer/composer.json index c4dbd47793015..28fb63fd4d6b2 100644 --- a/src/Symfony/Bridge/Swiftmailer/composer.json +++ b/src/Symfony/Bridge/Swiftmailer/composer.json @@ -23,7 +23,7 @@ "symfony/http-kernel": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Bridge\\Swiftmailer": "" } + "psr-0": { "Symfony\\Bridge\\Swiftmailer\\": "" } }, "target-dir": "Symfony/Bridge/Swiftmailer", "minimum-stability": "dev", diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 8c9f13df4bb2e..4a3e09e018616 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -36,7 +36,7 @@ "symfony/security": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Bridge\\Twig": "" } + "psr-0": { "Symfony\\Bridge\\Twig\\": "" } }, "target-dir": "Symfony/Bridge/Twig", "minimum-stability": "dev", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 869dc5d153501..d61031eb58fea 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -37,7 +37,7 @@ "symfony/validator": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Bundle\\FrameworkBundle": "" } + "psr-0": { "Symfony\\Bundle\\FrameworkBundle\\": "" } }, "target-dir": "Symfony/Bundle/FrameworkBundle", "minimum-stability": "dev", diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json index e369a94813f7c..f7be085bb7cc1 100644 --- a/src/Symfony/Bundle/SecurityBundle/composer.json +++ b/src/Symfony/Bundle/SecurityBundle/composer.json @@ -20,7 +20,7 @@ "symfony/security": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Bundle\\SecurityBundle": "" } + "psr-0": { "Symfony\\Bundle\\SecurityBundle\\": "" } }, "target-dir": "Symfony/Bundle/SecurityBundle", "minimum-stability": "dev", diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index c263b0a165cb3..3e05e854dfb41 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -20,7 +20,7 @@ "symfony/twig-bridge": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Bundle\\TwigBundle": "" } + "psr-0": { "Symfony\\Bundle\\TwigBundle\\": "" } }, "target-dir": "Symfony/Bundle/TwigBundle", "minimum-stability": "dev", diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index 3c14ba5eebe7b..62d1aae314e2b 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -20,7 +20,7 @@ "symfony/twig-bundle": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Bundle\\WebProfilerBundle": "" } + "psr-0": { "Symfony\\Bundle\\WebProfilerBundle\\": "" } }, "target-dir": "Symfony/Bundle/WebProfilerBundle", "minimum-stability": "dev", diff --git a/src/Symfony/Component/BrowserKit/composer.json b/src/Symfony/Component/BrowserKit/composer.json index 12ff0e041d5b9..e1921435106fc 100644 --- a/src/Symfony/Component/BrowserKit/composer.json +++ b/src/Symfony/Component/BrowserKit/composer.json @@ -27,7 +27,7 @@ "symfony/process": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Component\\BrowserKit": "" } + "psr-0": { "Symfony\\Component\\BrowserKit\\": "" } }, "target-dir": "Symfony/Component/BrowserKit", "minimum-stability": "dev", diff --git a/src/Symfony/Component/ClassLoader/composer.json b/src/Symfony/Component/ClassLoader/composer.json index 5a68c85e67dcf..effcb83308f84 100644 --- a/src/Symfony/Component/ClassLoader/composer.json +++ b/src/Symfony/Component/ClassLoader/composer.json @@ -23,7 +23,7 @@ "symfony/finder": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Component\\ClassLoader": "" } + "psr-0": { "Symfony\\Component\\ClassLoader\\": "" } }, "target-dir": "Symfony/Component/ClassLoader", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Config/composer.json b/src/Symfony/Component/Config/composer.json index cf7074b7ef382..e148c27c09085 100644 --- a/src/Symfony/Component/Config/composer.json +++ b/src/Symfony/Component/Config/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "autoload": { - "psr-0": { "Symfony\\Component\\Config": "" } + "psr-0": { "Symfony\\Component\\Config\\": "" } }, "target-dir": "Symfony/Component/Config", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json index a0f2b1e0943a1..3369681580e30 100644 --- a/src/Symfony/Component/Console/composer.json +++ b/src/Symfony/Component/Console/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "autoload": { - "psr-0": { "Symfony\\Component\\Console": "" } + "psr-0": { "Symfony\\Component\\Console\\": "" } }, "target-dir": "Symfony/Component/Console", "minimum-stability": "dev", diff --git a/src/Symfony/Component/CssSelector/composer.json b/src/Symfony/Component/CssSelector/composer.json index f893e74d2772f..54661fb87ba55 100644 --- a/src/Symfony/Component/CssSelector/composer.json +++ b/src/Symfony/Component/CssSelector/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "autoload": { - "psr-0": { "Symfony\\Component\\CssSelector": "" } + "psr-0": { "Symfony\\Component\\CssSelector\\": "" } }, "target-dir": "Symfony/Component/CssSelector", "minimum-stability": "dev", diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index b50f49b2a93cd..d951f3041d29d 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -27,7 +27,7 @@ "symfony/config": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Component\\DependencyInjection": "" } + "psr-0": { "Symfony\\Component\\DependencyInjection\\": "" } }, "target-dir": "Symfony/Component/DependencyInjection", "minimum-stability": "dev", diff --git a/src/Symfony/Component/DomCrawler/composer.json b/src/Symfony/Component/DomCrawler/composer.json index 80b1792b1aacc..5696a86893435 100644 --- a/src/Symfony/Component/DomCrawler/composer.json +++ b/src/Symfony/Component/DomCrawler/composer.json @@ -25,7 +25,7 @@ "symfony/css-selector": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Component\\DomCrawler": "" } + "psr-0": { "Symfony\\Component\\DomCrawler\\": "" } }, "target-dir": "Symfony/Component/DomCrawler", "minimum-stability": "dev", diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json index c31dd481e2d93..1a90992fd1867 100644 --- a/src/Symfony/Component/EventDispatcher/composer.json +++ b/src/Symfony/Component/EventDispatcher/composer.json @@ -26,7 +26,7 @@ "symfony/http-kernel": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Component\\EventDispatcher": "" } + "psr-0": { "Symfony\\Component\\EventDispatcher\\": "" } }, "target-dir": "Symfony/Component/EventDispatcher", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Filesystem/composer.json b/src/Symfony/Component/Filesystem/composer.json index 168cefb3e0677..d1f97cf8d42d2 100644 --- a/src/Symfony/Component/Filesystem/composer.json +++ b/src/Symfony/Component/Filesystem/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "autoload": { - "psr-0": { "Symfony\\Component\\Filesystem": "" } + "psr-0": { "Symfony\\Component\\Filesystem\\": "" } }, "target-dir": "Symfony/Component/Filesystem", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Finder/composer.json b/src/Symfony/Component/Finder/composer.json index 690fd427e3000..2ad5b34ccb4a6 100644 --- a/src/Symfony/Component/Finder/composer.json +++ b/src/Symfony/Component/Finder/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "autoload": { - "psr-0": { "Symfony\\Component\\Finder": "" } + "psr-0": { "Symfony\\Component\\Finder\\": "" } }, "target-dir": "Symfony/Component/Finder", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json index e861e3b1d2b47..1e69cb140d615 100644 --- a/src/Symfony/Component/Form/composer.json +++ b/src/Symfony/Component/Form/composer.json @@ -30,7 +30,7 @@ "symfony/http-foundation": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Component\\Form": "" } + "psr-0": { "Symfony\\Component\\Form\\": "" } }, "target-dir": "Symfony/Component/Form", "minimum-stability": "dev", diff --git a/src/Symfony/Component/HttpFoundation/composer.json b/src/Symfony/Component/HttpFoundation/composer.json index d10ef3180357e..d486e545ea0e6 100644 --- a/src/Symfony/Component/HttpFoundation/composer.json +++ b/src/Symfony/Component/HttpFoundation/composer.json @@ -20,7 +20,7 @@ }, "autoload": { "psr-0": { - "Symfony\\Component\\HttpFoundation": "", + "Symfony\\Component\\HttpFoundation\\": "", "SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stubs" } }, diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index 7c9fe7dc308fa..40f10b333bb9b 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -39,7 +39,7 @@ "symfony/finder": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Component\\HttpKernel": "" } + "psr-0": { "Symfony\\Component\\HttpKernel\\": "" } }, "target-dir": "Symfony/Component/HttpKernel", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Locale/composer.json b/src/Symfony/Component/Locale/composer.json index c450797b1774a..771b5cda59e82 100644 --- a/src/Symfony/Component/Locale/composer.json +++ b/src/Symfony/Component/Locale/composer.json @@ -22,7 +22,7 @@ "ext-intl": ">=5.3.3" }, "autoload": { - "psr-0": { "Symfony\\Component\\Locale": "" } + "psr-0": { "Symfony\\Component\\Locale\\": "" } }, "target-dir": "Symfony/Component/Locale", "minimum-stability": "dev", diff --git a/src/Symfony/Component/OptionsResolver/composer.json b/src/Symfony/Component/OptionsResolver/composer.json index 39ad60a68e15e..4812585a5277f 100644 --- a/src/Symfony/Component/OptionsResolver/composer.json +++ b/src/Symfony/Component/OptionsResolver/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "autoload": { - "psr-0": { "Symfony\\Component\\OptionsResolver": "" } + "psr-0": { "Symfony\\Component\\OptionsResolver\\": "" } }, "target-dir": "Symfony/Component/OptionsResolver", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Process/composer.json b/src/Symfony/Component/Process/composer.json index ea53b3c459abe..1681ef6c1f97b 100644 --- a/src/Symfony/Component/Process/composer.json +++ b/src/Symfony/Component/Process/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "autoload": { - "psr-0": { "Symfony\\Component\\Process": "" } + "psr-0": { "Symfony\\Component\\Process\\": "" } }, "target-dir": "Symfony/Component/Process", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index 2cee345e274ec..d3f653b761c84 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -30,7 +30,7 @@ "doctrine/common": ">=2.2,<2.4-dev" }, "autoload": { - "psr-0": { "Symfony\\Component\\Routing": "" } + "psr-0": { "Symfony\\Component\\Routing\\": "" } }, "target-dir": "Symfony/Component/Routing", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index ceaf28036cae5..73e07b513eaba 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -37,7 +37,7 @@ "doctrine/dbal": "to use the built-in ACL implementation" }, "autoload": { - "psr-0": { "Symfony\\Component\\Security": "" } + "psr-0": { "Symfony\\Component\\Security\\": "" } }, "target-dir": "Symfony/Component/Security", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Serializer/composer.json b/src/Symfony/Component/Serializer/composer.json index aa23f3839f773..cff1e49cfa4fe 100644 --- a/src/Symfony/Component/Serializer/composer.json +++ b/src/Symfony/Component/Serializer/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "autoload": { - "psr-0": { "Symfony\\Component\\Serializer": "" } + "psr-0": { "Symfony\\Component\\Serializer\\": "" } }, "target-dir": "Symfony/Component/Serializer", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Templating/composer.json b/src/Symfony/Component/Templating/composer.json index dcf589a2f75ec..234e28d63bdc7 100644 --- a/src/Symfony/Component/Templating/composer.json +++ b/src/Symfony/Component/Templating/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "autoload": { - "psr-0": { "Symfony\\Component\\Templating": "" } + "psr-0": { "Symfony\\Component\\Templating\\": "" } }, "target-dir": "Symfony/Component/Templating", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Translation/composer.json b/src/Symfony/Component/Translation/composer.json index dcc3c0e1a04e3..52e4c43b403bf 100644 --- a/src/Symfony/Component/Translation/composer.json +++ b/src/Symfony/Component/Translation/composer.json @@ -27,7 +27,7 @@ "symfony/yaml": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Component\\Translation": "" } + "psr-0": { "Symfony\\Component\\Translation\\": "" } }, "target-dir": "Symfony/Component/Translation", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index de1279e0a921f..a52d33bb21153 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -29,7 +29,7 @@ "symfony/yaml": "2.2.*" }, "autoload": { - "psr-0": { "Symfony\\Component\\Validator": "" } + "psr-0": { "Symfony\\Component\\Validator\\": "" } }, "target-dir": "Symfony/Component/Validator", "minimum-stability": "dev", diff --git a/src/Symfony/Component/Yaml/composer.json b/src/Symfony/Component/Yaml/composer.json index 13a9e23603e0d..e04dabf3fc22c 100644 --- a/src/Symfony/Component/Yaml/composer.json +++ b/src/Symfony/Component/Yaml/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "autoload": { - "psr-0": { "Symfony\\Component\\Yaml": "" } + "psr-0": { "Symfony\\Component\\Yaml\\": "" } }, "target-dir": "Symfony/Component/Yaml", "minimum-stability": "dev", From ef18e00283622b0fea82d4fa08ed032ca3f8c60f Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 18 Sep 2012 10:26:12 -0500 Subject: [PATCH 055/975] [HttpKernel] Added a bit to convert incomplete objects in the error message --- .../HttpKernel/Exception/FlattenException.php | 10 +++++ .../Tests/Exception/FlattenExceptionTest.php | 43 ++++++++++++++++++- 2 files changed, 52 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/Exception/FlattenException.php b/src/Symfony/Component/HttpKernel/Exception/FlattenException.php index b2ffb9fcfbb21..eb5e5715fa80b 100644 --- a/src/Symfony/Component/HttpKernel/Exception/FlattenException.php +++ b/src/Symfony/Component/HttpKernel/Exception/FlattenException.php @@ -221,6 +221,9 @@ private function flattenArgs($args, $level = 0) $result[$key] = array('boolean', $value); } elseif (is_resource($value)) { $result[$key] = array('resource', get_resource_type($value)); + } elseif ($value instanceof \__PHP_Incomplete_Class) { + // Special case of object, is_object will return false + $result[$key] = array('incomplete-object', $this->getClassNameFromIncomplete($value)); } else { $result[$key] = array('string', (string) $value); } @@ -228,4 +231,11 @@ private function flattenArgs($args, $level = 0) return $result; } + + private function getClassNameFromIncomplete(\__PHP_Incomplete_Class $value) + { + $array = new \ArrayObject($value); + + return $array['__PHP_Incomplete_Class_Name']; + } } diff --git a/src/Symfony/Component/HttpKernel/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/HttpKernel/Tests/Exception/FlattenExceptionTest.php index 65975aa96fc83..cd76c3a637b80 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Exception/FlattenExceptionTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Exception/FlattenExceptionTest.php @@ -101,7 +101,7 @@ public function testToArray(\Exception $exception, $statusCode) 'args' => array() )), ) - ),$flattened->toArray()); + ), $flattened->toArray()); } public function flattenDataProvider() @@ -125,4 +125,45 @@ private function createException($foo) { return new \Exception(); } + + public function testSetTraceIncompleteClass() + { + $flattened = FlattenException::create(new \Exception('test', 123)); + $flattened->setTrace( + array( + array( + 'file' => __FILE__, + 'line' => 123, + 'function' => 'test', + 'args' => array( + unserialize('O:14:"BogusTestClass":0:{}') + ), + ), + ), + 'foo.php', 123 + ); + + $this->assertEquals(array( + array( + 'message'=> 'test', + 'class'=>'Exception', + 'trace'=>array( + array( + 'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => '', + 'file' => 'foo.php', 'line' => 123, + 'args' => array(), + ), + array( + 'namespace' => '', 'short_class' => '', 'class' => '','type' => '','function' => 'test', + 'file' => __FILE__, 'line' => 123, + 'args' => array( + array( + 'incomplete-object', 'BogusTestClass' + ), + ), + ) + ), + ) + ), $flattened->toArray()); + } } From 310c2f98a9e520d82a8ea1a2b4c04c521743c304 Mon Sep 17 00:00:00 2001 From: Florin Patan Date: Sat, 15 Sep 2012 16:31:44 +0300 Subject: [PATCH 056/975] [2.2][WebProfilerBundle] Added minimize option to Web Profiler panels --- .../Controller/ProfilerController.php | 1 + .../Resources/public/css/profiler.css | 40 +++++++-- .../public/images/profiler/left-arrow.png | Bin 0 -> 1001 bytes .../public/images/profiler/right-arrow.png | Bin 0 -> 1001 bytes .../Resources/views/Collector/time.html.twig | 11 ++- .../Resources/views/Profiler/admin.html.twig | 2 +- .../views/Profiler/base_js.html.twig | 32 ++++++- .../Resources/views/Profiler/header.html.twig | 2 +- .../Resources/views/Profiler/layout.html.twig | 78 ++++++++++++++++++ .../Resources/views/Profiler/search.html.twig | 2 +- .../views/Profiler/toolbar.html.twig | 24 +++++- .../views/Profiler/toolbar_js.html.twig | 14 ++++ .../views/Profiler/toolbar_style.html.twig | 62 ++++++++++++-- 13 files changed, 243 insertions(+), 25 deletions(-) create mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/left-arrow.png create mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/right-arrow.png diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php index 3eebc77914750..b67e1fbe63cb6 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php @@ -186,6 +186,7 @@ public function toolbarAction(Request $request, $token, $position = null) 'profile' => $profile, 'templates' => $this->getTemplateManager()->getTemplates($profile), 'profiler_url' => $url, + 'token' => $token, )); } diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css index 8381a9a7b1cab..734826baa65fb 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css @@ -104,13 +104,14 @@ abbr { #content { padding: 0 50px; - margin: 0 auto; + margin: 0 auto 20px; font-family: Arial, Helvetica, sans-serif; min-width: 970px; + } #header { - padding: 30px 30px 20px; + padding: 20px 30px 20px; } #header h1 { @@ -131,6 +132,7 @@ abbr { padding-bottom: 0; display: block; background-color: #f6f6f6; + z-index: 10000; } #menu_profiler li a { @@ -144,9 +146,9 @@ abbr { #menu_profiler li a span.label { display: block; - padding: 20px 20px 16px 65px; - min-height: 24px; - _height: 24px; + padding: 20px 0px 16px 65px; + min-height: 16px; + overflow: hidden; } #menu_profiler li a span.icon { @@ -186,7 +188,7 @@ abbr { #collector_content { margin-left: 250px; - padding: 40px 50px; + padding: 30px 40px 40px; } #navigation { @@ -235,8 +237,9 @@ li { #resume { background-color: #f6f6f6; border-bottom: 1px solid #dfdfdf; - padding: 10px 50px; - margin-left: 210px; + padding: 18px 10px 0px; + margin-left: 250px; + height: 34px; color: #313131; font-size: 12px; -moz-border-radius-topright: 16px; @@ -284,7 +287,9 @@ table th.value { } .sf-exceptionreset .block_exception_detected .text_exception { - width: 520px; + left: 10px; + right: 10px; + width: 95%; } .sf-exceptionreset .block_exception_detected .illustration_exception { @@ -488,3 +493,20 @@ td.main, td.menu { border: 1px solid #999; border-width: 1px 0; } + +.collapsed-menu-parents #resume, +.collapsed-menu-parents #collector_content { + margin-left: 60px !important; +} + +.collapsed-menu { + width: 60px !important; +} + +.collapsed-menu span :not(.icon) { + display: none !important; +} + +.collapsed-menu span.icon img { + display: inline !important; +} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/left-arrow.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/left-arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..1c63f0919bd228b3a5f91330cd46a2f8774ceabd GIT binary patch literal 1001 zcmVI3MnFyh>-ewR#sL}C=@;y ziA4QYtMxX%3TF!D8w`e%Ua$A!!otE9CNs&&$r+c)Waljw%RRb3up)SHa4_F&Huv~^ zz9Z?Zp;Rh0n@py2Wo2a{#^9l$p$#1!9ghQnz}`#}NGulH1_lN+xctr}t8=@$x~^vm zC2e+gR*9v$hRe07!2Fh$mPU`qbCAXT2kCxvxm+Q9&-2h^GXy-&6<-Jt2|>D>q$p&9Cod3L+KBpeR& zQ$P=;10~Jx_vgFa?gFxfso?BjFepng)&l4Q3Um{~T_(_Y!&1uP%s4m;R+pV(oDr}C z6#w=j)Iq# z_!+iviA3@vFE4K{-Y*U&K!0gzsh8nXyOIRnO*f#pxY&b04vYvDOg?;5C=_p4xYl1d zq5+|it~2_)BKDokKztgF<`IswMV9beh&SjuVQoV-H8oGk9I)c>;;N93)VZB zDHM-)rm3mPj7tYe-c%I`aiTrY;m*#^(|vt?61G6{c#THmSDj9GGiIqyXn{%1C4fpH z^~lJG78T|$oYjm|Ao00000NkvXXu0mjfq3p}1 literal 0 HcmV?d00001 diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/right-arrow.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/right-arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..bc6166272eb952cfeabe589d5a6e7ba69c10b1bd GIT binary patch literal 1001 zcmV z&dwe|r&?D#*aRH~oFVohgdWj)krH21|~ zaUfMNO{G#bI-SlNfj~e+M8I^VQaNa~T3dD^dWAyaQ@vh) z9)=rR;sSGBdQVT!1p?5QM8OarCt=rZC|;6*b4(`FHJr6BO-xKk!CoN>pP!$qOy@f;@HfwL_Z%Nd+C~?#u+wI;*;N}y-?}9m%Y*H{7q)kpv zmc*DbFclt!kVKXs_#=Sxk}Hh)`8SxsV9-c_L!cIbEyaF-n>Y?emGo{I z3+1WN9Dc>fNX&1M$PI(kquQK_%Sjv(n+Jy9>eK3?2dh)kFBk(uOP_q)@mk^ z0ci?_Vj7?yVCYFyxzMw>R##V#%Ve@IJJr-dBd{cuN*}<`9N&>(w}zZ==;-Ls*45Rm zr3wYVdb_&1P*Irzt>HETpo1XU=;-K0olch*4u?rYo0^)wwzs$6fg$qidr*K#>yrs8 z2Awb(jg4BZ_AuBCBEX`eqD|;DP37g~<8b-{#SLhkOqaPA6&uh|Q0>gj%rS$(uph*7 zI2=?=dlRmxs93M8taN}-O1?%e1EE;?zMb|K)m1j=0H`D?)aG)b;4`7WPUCPm8_^W` zjG7J5Cy*t+SftX>r-M*#=S1_J6@4P;_=&0>DnQWy@+AYN`t3x)lv~n^?Ak}$F98Ms X>*aOuJKrDw00000NkvXXu0mjfh)3Nk literal 0 HcmV?d00001 diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig index d283182720f18..f4179792ffba4 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig @@ -134,7 +134,7 @@ "use strict"; var _drawingColors = {{ colors|json_encode|raw }}, - _storagePrefix = 'sf2/profiler/timeline', + _storagePrefix = 'timeline/', _threshold = 1, _requests = requests, _maxRequestTime = maxRequestTime; @@ -353,7 +353,7 @@ }; this.getThreshold = function() { - var threshold = localStorage.getItem(_storagePrefix + '/threshold'); + var threshold = Sfjs.getPreference(_storagePrefix + 'threshold'); if (threshold === null) { return _threshold; @@ -368,7 +368,7 @@ { _threshold = threshold; - localStorage.setItem(_storagePrefix + '/threshold', threshold); + Sfjs.setPreference(_storagePrefix + 'threshold', threshold); return this; }; @@ -423,6 +423,11 @@ elementThresholdControl.onclick = canvasAutoUpdateOnThresholdChange; elementThresholdControl.onchange = canvasAutoUpdateOnThresholdChange; elementThresholdControl.onkeyup = canvasAutoUpdateOnThresholdChange; + + window.setTimeout(function() { + canvasAutoUpdateOnThresholdChange(null); + }, 50); + //]]> {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.html.twig index 2488af4157221..8989115b2b499 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.html.twig @@ -1,4 +1,4 @@ -
+ + + {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/search.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/search.html.twig index d3082406493b0..8bf95ec94a956 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/search.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/search.html.twig @@ -1,4 +1,4 @@ -
+\n"; + } + } catch (\Exception $e) { + // something nasty happened and we cannot throw an exception anymore + if ($this->debug) { + $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($exception), $exception->getMessage()); + } else { + $title = 'Whoops, looks like something went wrong.'; + } } } diff --git a/src/Symfony/Component/HttpKernel/Tests/Debug/ExceptionHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/Debug/ExceptionHandlerTest.php index c13e559362b7b..4ccbe7dea4e42 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Debug/ExceptionHandlerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Debug/ExceptionHandlerTest.php @@ -45,11 +45,11 @@ public function testStatusCode() $response = $handler->createResponse(new \RuntimeException('Foo')); $this->assertEquals('500', $response->getStatusCode()); - $this->assertContains('Whoops, looks like something went wrong.', $response->getContent()); + $this->assertContains('Whoops, looks like something went wrong.', $response->getContent()); $response = $handler->createResponse(new NotFoundHttpException('Foo')); $this->assertEquals('404', $response->getStatusCode()); - $this->assertContains('Sorry, the page you are looking for could not be found.', $response->getContent()); + $this->assertContains('Sorry, the page you are looking for could not be found.', $response->getContent()); } public function testHeaders() From 32bb754fbe44aefaa665c576d6fbdbda15f205cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Simon?= Date: Sat, 21 Apr 2012 21:31:44 +0200 Subject: [PATCH 082/975] [2.2] [WIP] [Finder] Adding native finders implementations --- .../Finder/Adapter/AbstractAdapter.php | 174 ++++++++ .../Finder/Adapter/AdapterInterface.php | 123 ++++++ .../Finder/Adapter/GnuFindAdapter.php | 312 +++++++++++++++ .../Component/Finder/Adapter/PhpAdapter.php | 94 +++++ .../Exception/AdapterFailureException.php | 46 +++ .../Finder/Exception/ExceptionInterface.php | 14 + .../OperationNotPermitedException.php | 19 + .../ShellCommandFailureException.php | 45 +++ .../Finder/Expression/Expression.php | 112 ++++++ .../Component/Finder/Expression/Glob.php | 126 ++++++ .../Component/Finder/Expression/Regex.php | 315 +++++++++++++++ .../Finder/Expression/ValueInterface.php | 46 +++ src/Symfony/Component/Finder/Finder.php | 144 +++++-- .../Iterator/DepthRangeFilterIterator.php | 26 +- .../Finder/Iterator/FilePathsIterator.php | 123 ++++++ .../Iterator/FilenameFilterIterator.php | 4 +- .../Iterator/MultiplePcreFilterIterator.php | 17 +- .../Component/Finder/Shell/Command.php | 245 ++++++++++++ src/Symfony/Component/Finder/Shell/Shell.php | 86 ++++ .../Tests/Expression/ExpressionTest.php | 68 ++++ .../Tests/{ => Expression}/GlobTest.php | 8 +- .../Finder/Tests/Expression/RegexTest.php | 143 +++++++ .../Finder/Tests/FakeAdapter/DummyAdapter.php | 58 +++ .../Tests/FakeAdapter/FailingAdapter.php | 45 +++ .../Finder/Tests/FakeAdapter/NamedAdapter.php | 57 +++ .../Tests/FakeAdapter/UnsupportedAdapter.php | 44 ++ .../Component/Finder/Tests/FinderTest.php | 375 +++++++++++++----- .../Tests/Iterator/DepthRangeIteratorTest.php | 14 +- .../Tests/Iterator/FilePathsIteratorTest.php | 66 +++ .../Tests/Iterator/IteratorTestCase.php | 4 +- 30 files changed, 2764 insertions(+), 189 deletions(-) create mode 100644 src/Symfony/Component/Finder/Adapter/AbstractAdapter.php create mode 100644 src/Symfony/Component/Finder/Adapter/AdapterInterface.php create mode 100644 src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php create mode 100644 src/Symfony/Component/Finder/Adapter/PhpAdapter.php create mode 100644 src/Symfony/Component/Finder/Exception/AdapterFailureException.php create mode 100644 src/Symfony/Component/Finder/Exception/ExceptionInterface.php create mode 100644 src/Symfony/Component/Finder/Exception/OperationNotPermitedException.php create mode 100644 src/Symfony/Component/Finder/Exception/ShellCommandFailureException.php create mode 100644 src/Symfony/Component/Finder/Expression/Expression.php create mode 100644 src/Symfony/Component/Finder/Expression/Glob.php create mode 100644 src/Symfony/Component/Finder/Expression/Regex.php create mode 100644 src/Symfony/Component/Finder/Expression/ValueInterface.php create mode 100644 src/Symfony/Component/Finder/Iterator/FilePathsIterator.php create mode 100644 src/Symfony/Component/Finder/Shell/Command.php create mode 100644 src/Symfony/Component/Finder/Shell/Shell.php create mode 100644 src/Symfony/Component/Finder/Tests/Expression/ExpressionTest.php rename src/Symfony/Component/Finder/Tests/{ => Expression}/GlobTest.php (77%) create mode 100644 src/Symfony/Component/Finder/Tests/Expression/RegexTest.php create mode 100644 src/Symfony/Component/Finder/Tests/FakeAdapter/DummyAdapter.php create mode 100644 src/Symfony/Component/Finder/Tests/FakeAdapter/FailingAdapter.php create mode 100644 src/Symfony/Component/Finder/Tests/FakeAdapter/NamedAdapter.php create mode 100644 src/Symfony/Component/Finder/Tests/FakeAdapter/UnsupportedAdapter.php create mode 100644 src/Symfony/Component/Finder/Tests/Iterator/FilePathsIteratorTest.php diff --git a/src/Symfony/Component/Finder/Adapter/AbstractAdapter.php b/src/Symfony/Component/Finder/Adapter/AbstractAdapter.php new file mode 100644 index 0000000000000..8958571bdff7b --- /dev/null +++ b/src/Symfony/Component/Finder/Adapter/AbstractAdapter.php @@ -0,0 +1,174 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Adapter; + +/** + * Interface for finder engine implementations. + * + * @author Jean-François Simon + */ +abstract class AbstractAdapter implements AdapterInterface +{ + protected $followLinks = false; + protected $mode = 0; + protected $minDepth = 0; + protected $maxDepth = INF; + protected $exclude = array(); + protected $names = array(); + protected $notNames = array(); + protected $contains = array(); + protected $notContains = array(); + protected $sizes = array(); + protected $dates = array(); + protected $filters = array(); + protected $sort = false; + + /** + * {@inheritdoc} + */ + public function setFollowLinks($followLinks) + { + $this->followLinks = $followLinks; + + return $this; + } + + /** + * {@inheritdoc} + */ + public function setMode($mode) + { + $this->mode = $mode; + + return $this; + } + + /** + * {@inheritdoc} + */ + public function setDepths(array $depths) + { + $this->minDepth = 0; + $this->maxDepth = INF; + + foreach ($depths as $comparator) { + switch ($comparator->getOperator()) { + case '>': + $this->minDepth = $comparator->getTarget() + 1; + break; + case '>=': + $this->minDepth = $comparator->getTarget(); + break; + case '<': + $this->maxDepth = $comparator->getTarget() - 1; + break; + case '<=': + $this->maxDepth = $comparator->getTarget(); + break; + default: + $this->minDepth = $this->maxDepth = $comparator->getTarget(); + } + } + + return $this; + } + + /** + * {@inheritdoc} + */ + public function setExclude(array $exclude) + { + $this->exclude = $exclude; + + return $this; + } + + /** + * {@inheritdoc} + */ + public function setNames(array $names) + { + $this->names = $names; + + return $this; + } + + /** + * {@inheritdoc} + */ + public function setNotNames(array $notNames) + { + $this->notNames = $notNames; + + return $this; + } + + /** + * {@inheritdoc} + */ + public function setContains(array $contains) + { + $this->contains = $contains; + + return $this; + } + + /** + * {@inheritdoc} + */ + public function setNotContains(array $notContains) + { + $this->notContains = $notContains; + + return $this; + } + + /** + * {@inheritdoc} + */ + public function setSizes(array $sizes) + { + $this->sizes = $sizes; + + return $this; + } + + /** + * {@inheritdoc} + */ + public function setDates(array $dates) + { + $this->dates = $dates; + + return $this; + } + + /** + * {@inheritdoc} + */ + public function setFilters(array $filters) + { + $this->filters = $filters; + + return $this; + } + + /** + * {@inheritdoc} + */ + public function setSort($sort) + { + $this->sort = $sort; + + return $this; + } +} diff --git a/src/Symfony/Component/Finder/Adapter/AdapterInterface.php b/src/Symfony/Component/Finder/Adapter/AdapterInterface.php new file mode 100644 index 0000000000000..246a26cb06ad0 --- /dev/null +++ b/src/Symfony/Component/Finder/Adapter/AdapterInterface.php @@ -0,0 +1,123 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Adapter; + +/** + * @author Jean-François Simon + */ +interface AdapterInterface +{ + /** + * @param bool $followLinks + * + * @return AdapterInterface Current instance + */ + function setFollowLinks($followLinks); + + /** + * @param int $mode + * + * @return AdapterInterface Current instance + */ + function setMode($mode); + + /** + * @param array $exclude + * + * @return AdapterInterface Current instance + */ + function setExclude(array $exclude); + + /** + * @param array $depths + * + * @return AdapterInterface Current instance + */ + function setDepths(array $depths); + + /** + * @param array $names + * + * @return AdapterInterface Current instance + */ + function setNames(array $names); + + /** + * @param array $notNames + * + * @return AdapterInterface Current instance + */ + function setNotNames(array $notNames); + + /** + * @param array $contains + * + * @return AdapterInterface Current instance + */ + function setContains(array $contains); + + /** + * @param array $notContains + * + * @return AdapterInterface Current instance + */ + function setNotContains(array $notContains); + + /** + * @param array $sizes + * + * @return AdapterInterface Current instance + */ + function setSizes(array $sizes); + + /** + * @param array $dates + * + * @return AdapterInterface Current instance + */ + function setDates(array $dates); + + /** + * @param array $filters + * + * @return AdapterInterface Current instance + */ + function setFilters(array $filters); + + /** + * @param \Closure|int $sort + * + * @return AdapterInterface Current instance + */ + function setSort($sort); + + /** + * @param string $dir + * + * @return \Iterator Result iterator + */ + function searchInDirectory($dir); + + /** + * Tests adapter support for current platform. + * + * @return bool + */ + function isSupported(); + + /** + * Returns adapter name. + * + * @return string + */ + function getName(); +} diff --git a/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php b/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php new file mode 100644 index 0000000000000..98ac30f9b2d01 --- /dev/null +++ b/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php @@ -0,0 +1,312 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Adapter; + +use Symfony\Component\Finder\Iterator; +use Symfony\Component\Finder\Shell\Shell; +use Symfony\Component\Finder\Expression\Expression; +use Symfony\Component\Finder\Shell\Command; +use Symfony\Component\Finder\Iterator\SortableIterator; +use Symfony\Component\Finder\Comparator\NumberComparator; +use Symfony\Component\Finder\Comparator\DateComparator; + +/** + * Shell engine implementation using GNU find command. + * + * @author Jean-François Simon + */ +class GnuFindAdapter extends AbstractAdapter +{ + /** + * @var Shell + */ + private $shell; + + /** + * Constructor. + */ + public function __construct() + { + $this->shell = new Shell(); + } + + /** + * {@inheritdoc} + */ + public function searchInDirectory($dir) + { + // having "/../" in path make find fail + $dir = realpath($dir); + + // searching directories containing or not containing strings leads to no result + if (Iterator\FileTypeFilterIterator::ONLY_DIRECTORIES === $this->mode && ($this->contains || $this->notContains)) { + return new Iterator\FilePathsIterator(array(), $dir); + } + + $command = Command::create(); + + $find = $command + ->ins('find') + ->add('find ') + ->arg($dir) + ->add('-noleaf') // -noleaf option is required for filesystems who doesn't follow '.' and '..' convention + ->add('-regextype posix-extended'); + + if ($this->followLinks) { + $find->add('-follow'); + } + + $find->add('-mindepth')->add($this->minDepth+1); + // warning! INF < INF => true ; INF == INF => false ; INF === INF => true + // https://bugs.php.net/bug.php?id=9118 + if (INF !== $this->maxDepth) { + $find->add('-maxdepth')->add($this->maxDepth+1); + } + + if (Iterator\FileTypeFilterIterator::ONLY_DIRECTORIES === $this->mode) { + $find->add('-type d'); + } elseif (Iterator\FileTypeFilterIterator::ONLY_FILES === $this->mode) { + $find->add('-type f'); + } + + $this->buildNamesFiltering($find, $this->names); + $this->buildNamesFiltering($find, $this->notNames, true); + $this->buildSizesFiltering($find, $this->sizes); + $this->buildDatesFiltering($find, $this->dates); + + $useGrep = $this->shell->testCommand('grep') && $this->shell->testCommand('xargs'); + $useSort = is_int($this->sort) && $this->shell->testCommand('sort') && $this->shell->testCommand('awk'); + + if ($useGrep && ($this->contains || $this->notContains)) { + $grep = $command->ins('grep'); + $this->buildContentFiltering($grep, $this->contains); + $this->buildContentFiltering($grep, $this->notContains, true); + } + + if ($useSort) { + $this->buildSorting($command, $this->sort); + } + + $paths = $this->shell->testCommand('uniq') ? $command->add('| uniq')->execute() : array_unique($command->execute()); + $iterator = new Iterator\FilePathsIterator($paths, $dir); + + if ($this->exclude) { + $iterator = new Iterator\ExcludeDirectoryFilterIterator($iterator, $this->exclude); + } + + if (!$useGrep && ($this->contains || $this->notContains)) { + $iterator = new Iterator\FilecontentFilterIterator($iterator, $this->contains, $this->notContains); + } + + if ($this->filters) { + $iterator = new Iterator\CustomFilterIterator($iterator, $this->filters); + } + + if (!$useSort && $this->sort) { + $iteratorAggregate = new Iterator\SortableIterator($iterator, $this->sort); + $iterator = $iteratorAggregate->getIterator(); + } + + return $iterator; + } + + /** + * {@inheritdoc} + */ + public function isSupported() + { + return $this->shell->getType() !== Shell::TYPE_WINDOWS + && $this->shell->testCommand('find'); + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return 'gnu_find'; + } + + /** + * @param Command $command + * @param string[] $names + * @param bool $not + */ + private function buildNamesFiltering(Command $command, array $names, $not = false) + { + if (0 === count($names)) { + return; + } + + $command->add($not ? '-not' : null)->cmd('('); + + foreach ($names as $i => $name) { + $expr = Expression::create($name); + + // Fixes 'not search' and 'fuls path matching' regex problems. + // - Jokers '.' are replaced by [^/]. + // - We add '[^/]*' before and after regex (if no ^|$ flags are present). + if ($expr->isRegex()) { + $regex = $expr->getRegex(); + $regex->prepend($regex->hasStartFlag() ? '/' : '/[^/]*') + ->setStartFlag(false) + ->setStartJoker(true) + ->replaceJokers('[^/]'); + if (!$regex->hasEndFlag() || $regex->hasEndJoker()) { + $regex->setEndJoker(false)->append('[^/]*'); + } + } + + $command + ->add($i > 0 ? '-or' : null) + ->add($expr->isRegex() + ? ($expr->isCaseSensitive() ? '-regex' : '-iregex') + : ($expr->isCaseSensitive() ? '-name' : '-iname') + ) + ->arg($expr->renderPattern()); + } + + $command->cmd(')'); + } + + /** + * @param Command $command + * @param NumberComparator[] $sizes + */ + private function buildSizesFiltering(Command $command, array $sizes) + { + foreach ($sizes as $i => $size) { + $command->add($i > 0 ? '-and' : null); + + if ('<=' === $size->getOperator()) { + $command->add('-size -'.($size->getTarget()+1).'c'); + continue; + } + + if ('<' === $size->getOperator()) { + $command->add('-size -'.$size->getTarget().'c'); + continue; + } + + if ('>=' === $size->getOperator()) { + $command->add('-size +'.($size->getTarget()-1).'c'); + continue; + } + + if ('>' === $size->getOperator()) { + $command->add('-size +'.$size->getTarget().'c'); + continue; + } + + if ('!=' === $size->getOperator()) { + $command->add('-size -'.$size->getTarget().'c'); + $command->add('-size +'.$size->getTarget().'c'); + continue; + } + + $command->add('-size '.$size->getTarget().'c'); + } + } + + /** + * @param Command $command + * @param DateComparator[] $dates + */ + private function buildDatesFiltering(Command $command, array $dates) + { + foreach ($dates as $i => $date) { + $command->add($i > 0 ? '-and' : null); + + $mins = (int) round((time()-$date->getTarget())/60); + + if (0 > $mins) { + // mtime is in the future + $command->add(' -mmin -0'); + // we will have no result so we dont need to continue + return; + } + + if ('<=' === $date->getOperator()) { + $command->add('-mmin +'.($mins-1)); + continue; + } + + if ('<' === $date->getOperator()) { + $command->add('-mmin +'.$mins); + continue; + } + + if ('>=' === $date->getOperator()) { + $command->add('-mmin -'.($mins+1)); + continue; + } + + if ('>' === $date->getOperator()) { + $command->add('-mmin -'.$mins); + continue; + } + + if ('!=' === $date->getOperator()) { + $command->add('-mmin +'.$mins.' -or -mmin -'.$mins); + continue; + } + + $command->add('-mmin '.$mins); + } + } + + /** + * @param Command $command + * @param array $contains + * @param bool $not + */ + private function buildContentFiltering(Command $command, array $contains, $not = false) + { + foreach ($contains as $contain) { + $expr = Expression::create($contain); + + // todo: avoid forking process for each $pattern by using multiple -e options + $command + ->add('| xargs -r grep -I') + ->add($expr->isCaseSensitive() ? null : '-i') + ->add($not ? '-L' : '-l') + ->add('-Ee')->arg($expr->renderPattern()); + } + } + + private function buildSorting(Command $command, $sort) + { + switch ($sort) { + case SortableIterator::SORT_BY_NAME: + $format = null; + break; + case SortableIterator::SORT_BY_TYPE: + $format = '%y'; + break; + case SortableIterator::SORT_BY_ACCESSED_TIME: + $format = '%A@'; + break; + case SortableIterator::SORT_BY_CHANGED_TIME: + $format = '%C@'; + break; + case SortableIterator::SORT_BY_MODIFIED_TIME: + $format = '%T@'; + break; + default: + throw new \InvalidArgumentException('Unknown sort options: '.$sort.'.'); + } + + $command->get('find')->add('-printf')->arg($format.' %h/%f\\n'); + $command->ins('sort')->add('| sort'); + $command->ins('awk')->add('| awk')->arg('{ print $'.(null === $format ? '1' : '2').' }'); + } +} diff --git a/src/Symfony/Component/Finder/Adapter/PhpAdapter.php b/src/Symfony/Component/Finder/Adapter/PhpAdapter.php new file mode 100644 index 0000000000000..2dbae76a565f7 --- /dev/null +++ b/src/Symfony/Component/Finder/Adapter/PhpAdapter.php @@ -0,0 +1,94 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Adapter; + +use Symfony\Component\Finder\Iterator; + +/** + * PHP finder engine implementation. + * + * @author Jean-François Simon + */ +class PhpAdapter extends AbstractAdapter +{ + /** + * {@inheritdoc} + */ + public function searchInDirectory($dir) + { + $flags = \RecursiveDirectoryIterator::SKIP_DOTS; + + if ($this->followLinks) { + $flags |= \RecursiveDirectoryIterator::FOLLOW_SYMLINKS; + } + + $iterator = new \RecursiveIteratorIterator( + new Iterator\RecursiveDirectoryIterator($dir, $flags), + \RecursiveIteratorIterator::SELF_FIRST + ); + + if ($this->minDepth > 0 || $this->maxDepth < INF) { + $iterator = new Iterator\DepthRangeFilterIterator($iterator, $this->minDepth, $this->maxDepth); + } + + if ($this->mode) { + $iterator = new Iterator\FileTypeFilterIterator($iterator, $this->mode); + } + + if ($this->exclude) { + $iterator = new Iterator\ExcludeDirectoryFilterIterator($iterator, $this->exclude); + } + + if ($this->names || $this->notNames) { + $iterator = new Iterator\FilenameFilterIterator($iterator, $this->names, $this->notNames); + } + + if ($this->contains || $this->notContains) { + $iterator = new Iterator\FilecontentFilterIterator($iterator, $this->contains, $this->notContains); + } + + if ($this->sizes) { + $iterator = new Iterator\SizeRangeFilterIterator($iterator, $this->sizes); + } + + if ($this->dates) { + $iterator = new Iterator\DateRangeFilterIterator($iterator, $this->dates); + } + + if ($this->filters) { + $iterator = new Iterator\CustomFilterIterator($iterator, $this->filters); + } + + if ($this->sort) { + $iteratorAggregate = new Iterator\SortableIterator($iterator, $this->sort); + $iterator = $iteratorAggregate->getIterator(); + } + + return $iterator; + } + + /** + * {@inheritdoc} + */ + public function isSupported() + { + return true; + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return 'php'; + } +} diff --git a/src/Symfony/Component/Finder/Exception/AdapterFailureException.php b/src/Symfony/Component/Finder/Exception/AdapterFailureException.php new file mode 100644 index 0000000000000..15fa22147d837 --- /dev/null +++ b/src/Symfony/Component/Finder/Exception/AdapterFailureException.php @@ -0,0 +1,46 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Exception; + +use Symfony\Component\Finder\Adapter\AdapterInterface; + +/** + * Base exception for all adapter failures. + * + * @author Jean-François Simon + */ +class AdapterFailureException extends \RuntimeException implements ExceptionInterface +{ + /** + * @var \Symfony\Component\Finder\Adapter\AdapterInterface + */ + private $adapter; + + /** + * @param AdapterInterface $adapter + * @param string|null $message + * @param \Exception|null $previous + */ + public function __construct(AdapterInterface $adapter, $message = null, \Exception $previous = null) + { + $this->adapter = $adapter; + parent::__construct($message ?: 'Search failed with "'.$adapter->getName().'" adapter.', $previous); + } + + /** + * {@inheritdoc} + */ + public function getAdapter() + { + return $this->adapter; + } +} diff --git a/src/Symfony/Component/Finder/Exception/ExceptionInterface.php b/src/Symfony/Component/Finder/Exception/ExceptionInterface.php new file mode 100644 index 0000000000000..86d391b91e5cf --- /dev/null +++ b/src/Symfony/Component/Finder/Exception/ExceptionInterface.php @@ -0,0 +1,14 @@ + + */ +interface ExceptionInterface +{ + /** + * @return \Symfony\Component\Finder\Adapter\AdapterInterface + */ + function getAdapter(); +} diff --git a/src/Symfony/Component/Finder/Exception/OperationNotPermitedException.php b/src/Symfony/Component/Finder/Exception/OperationNotPermitedException.php new file mode 100644 index 0000000000000..3663112259c4d --- /dev/null +++ b/src/Symfony/Component/Finder/Exception/OperationNotPermitedException.php @@ -0,0 +1,19 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Exception; + +/** + * @author Jean-François Simon + */ +class OperationNotPermitedException extends AdapterFailureException +{ +} diff --git a/src/Symfony/Component/Finder/Exception/ShellCommandFailureException.php b/src/Symfony/Component/Finder/Exception/ShellCommandFailureException.php new file mode 100644 index 0000000000000..2658f6a508fb5 --- /dev/null +++ b/src/Symfony/Component/Finder/Exception/ShellCommandFailureException.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Exception; + +use Symfony\Component\Finder\Adapter\AdapterInterface; +use Symfony\Component\Finder\Shell\Command; + +/** + * @author Jean-François Simon + */ +class ShellCommandFailureException extends AdapterFailureException +{ + /** + * @var Command + */ + private $command; + + /** + * @param AdapterInterface $adapter + * @param Command $command + * @param \Exception|null $previous + */ + public function __construct(AdapterInterface $adapter, Command $command, \Exception $previous = null) + { + $this->command = $command; + parent::__construct($adapter, 'Shell command failed: "'.$command->join().'".', $previous); + } + + /** + * @return Command + */ + public function getCommand() + { + return $this->command; + } +} diff --git a/src/Symfony/Component/Finder/Expression/Expression.php b/src/Symfony/Component/Finder/Expression/Expression.php new file mode 100644 index 0000000000000..b8124124269d9 --- /dev/null +++ b/src/Symfony/Component/Finder/Expression/Expression.php @@ -0,0 +1,112 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Expression; + +/** + * @author Jean-François Simon + */ +class Expression implements ValueInterface +{ + const TYPE_REGEX = 1; + const TYPE_GLOB = 2; + + /** + * @var ValueInterface + */ + private $value; + + /** + * @param string $expr + * + * @return Expression + */ + public static function create($expr) + { + return new self($expr); + } + + /** + * @param string $expr + */ + public function __construct($expr) + { + try { + $this->value = Regex::create($expr); + } catch(\InvalidArgumentException $e) { + $this->value = new Glob($expr); + } + } + + /** + * @return string + */ + public function __toString() + { + return $this->render(); + } + + /** + * {@inheritdoc} + */ + public function render() + { + return $this->value->render(); + } + + /** + * {@inheritdoc} + */ + public function renderPattern() + { + return $this->value->renderPattern(); + } + + /** + * @return bool + */ + public function isCaseSensitive() + { + return $this->value->isCaseSensitive(); + } + + /** + * @return int + */ + public function getType() + { + return $this->value->getType(); + } + + /** + * @return bool + */ + public function isRegex() + { + return self::TYPE_REGEX === $this->value->getType(); + } + + /** + * @return bool + */ + public function isGlob() + { + return self::TYPE_GLOB === $this->value->getType(); + } + + /** + * @return Regex + */ + public function getRegex() + { + return self::TYPE_REGEX === $this->value->getType() ? $this->value : $this->value->toRegex(); + } +} diff --git a/src/Symfony/Component/Finder/Expression/Glob.php b/src/Symfony/Component/Finder/Expression/Glob.php new file mode 100644 index 0000000000000..5e7b2d01127fa --- /dev/null +++ b/src/Symfony/Component/Finder/Expression/Glob.php @@ -0,0 +1,126 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Expression; + +/** + * @author Jean-François Simon + */ +class Glob implements ValueInterface +{ + /** + * @var string + */ + private $pattern; + + /** + * @param string $pattern + */ + public function __construct($pattern) + { + $this->pattern = $pattern; + } + + /** + * {@inheritdoc} + */ + public function render() + { + return $this->pattern; + } + + /** + * {@inheritdoc} + */ + public function renderPattern() + { + return $this->pattern; + } + + /** + * {@inheritdoc} + */ + public function getType() + { + return Expression::TYPE_GLOB; + } + + /** + * {@inheritdoc} + */ + public function isCaseSensitive() + { + return true; + } + + /** + * @param bool $strictLeadingDot + * @param bool $strictWildcardSlash + * + * @return Regex + */ + public function toRegex($strictLeadingDot = true, $strictWildcardSlash = true) + { + $firstByte = true; + $escaping = false; + $inCurlies = 0; + $regex = ''; + $sizeGlob = strlen($this->pattern); + for ($i = 0; $i < $sizeGlob; $i++) { + $car = $this->pattern[$i]; + if ($firstByte) { + if ($strictLeadingDot && '.' !== $car) { + $regex .= '(?=[^\.])'; + } + + $firstByte = false; + } + + if ('/' === $car) { + $firstByte = true; + } + + if ('.' === $car || '(' === $car || ')' === $car || '|' === $car || '+' === $car || '^' === $car || '$' === $car) { + $regex .= "\\$car"; + } elseif ('*' === $car) { + $regex .= $escaping ? '\\*' : ($strictWildcardSlash ? '[^/]*' : '.*'); + } elseif ('?' === $car) { + $regex .= $escaping ? '\\?' : ($strictWildcardSlash ? '[^/]' : '.'); + } elseif ('{' === $car) { + $regex .= $escaping ? '\\{' : '('; + if (!$escaping) { + ++$inCurlies; + } + } elseif ('}' === $car && $inCurlies) { + $regex .= $escaping ? '}' : ')'; + if (!$escaping) { + --$inCurlies; + } + } elseif (',' === $car && $inCurlies) { + $regex .= $escaping ? ',' : '|'; + } elseif ('\\' === $car) { + if ($escaping) { + $regex .= '\\\\'; + $escaping = false; + } else { + $escaping = true; + } + + continue; + } else { + $regex .= $car; + } + $escaping = false; + } + + return new Regex('^'.$regex.'$'); + } +} diff --git a/src/Symfony/Component/Finder/Expression/Regex.php b/src/Symfony/Component/Finder/Expression/Regex.php new file mode 100644 index 0000000000000..40d776394a891 --- /dev/null +++ b/src/Symfony/Component/Finder/Expression/Regex.php @@ -0,0 +1,315 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Expression; + +/** + * @author Jean-François Simon + */ +class Regex implements ValueInterface +{ + const START_FLAG = '^'; + const END_FLAG = '$'; + const BOUNDARY = '~'; + const JOKER = '.*'; + const ESCAPING = '\\'; + + /** + * @var string + */ + private $pattern; + + /** + * @var array + */ + private $options; + + /** + * @var bool + */ + private $startFlag; + + /** + * @var bool + */ + private $endFlag; + + /** + * @var bool + */ + private $startJoker; + + /** + * @var bool + */ + private $endJoker; + + /** + * @param string $expr + * + * @return Regex + * + * @throws \InvalidArgumentException + */ + public static function create($expr) + { + if (preg_match('/^(.{3,}?)([imsxuADU]*)$/', $expr, $m)) { + $start = substr($m[1], 0, 1); + $end = substr($m[1], -1); + + if (($start === $end && !preg_match('/[*?[:alnum:] \\\\]/', $start)) || ($start === '{' && $end === '}')) { + return new self(substr($m[1], 1, -1), $m[2]); + } + } + + throw new \InvalidArgumentException('Given expression is not a regex.'); + } + + /** + * @param string $pattern + * @param string $options + */ + public function __construct($pattern, $options = '') + { + $this->parsePattern($pattern); + $this->options = $options; + } + + /** + * @return string + */ + public function __toString() + { + return $this->render(); + } + + /** + * {@inheritdoc} + */ + public function render() + { + return self::BOUNDARY + .$this->renderPattern() + .self::BOUNDARY + .$this->options; + } + + /** + * {@inheritdoc} + */ + public function renderPattern() + { + return ($this->startFlag ? self::START_FLAG : '') + .($this->startJoker ? self::JOKER : '') + .$this->pattern + .($this->endJoker ? self::JOKER : '') + .($this->endFlag ? self::END_FLAG : ''); + } + + /** + * {@inheritdoc} + */ + public function isCaseSensitive() + { + return !$this->hasOption('i'); + } + + /** + * {@inheritdoc} + */ + public function getType() + { + return Expression::TYPE_REGEX; + } + + /** + * @param string $option + * + * @return bool + */ + public function hasOption($option) + { + return false !== strpos($this->options, $option); + } + + /** + * @param string $option + * + * @return Regex + */ + public function addOption($option) + { + if (!$this->hasOption($option)) { + $this->options.= $option; + } + + return $this; + } + + /** + * @param string $option + * + * @return Regex + */ + public function removeOption($option) + { + $this->options = str_replace($option, '', $this->options); + + return $this; + } + + /** + * @param bool $startFlag + * + * @return Regex + */ + public function setStartFlag($startFlag) + { + $this->startFlag = $startFlag; + + return $this; + } + + /** + * @return bool + */ + public function hasStartFlag() + { + return $this->startFlag; + } + + /** + * @param bool $endFlag + * + * @return Regex + */ + public function setEndFlag($endFlag) + { + $this->endFlag = (bool) $endFlag; + + return $this; + } + + /** + * @return bool + */ + public function hasEndFlag() + { + return $this->endFlag; + } + + /** + * @param bool $startJoker + * + * @return Regex + */ + public function setStartJoker($startJoker) + { + $this->startJoker = $startJoker; + + return $this; + } + + /** + * @return bool + */ + public function hasStartJoker() + { + return $this->startJoker; + } + + /** + * @param bool $endJoker + * + * @return Regex + */ + public function setEndJoker($endJoker) + { + $this->endJoker = (bool) $endJoker; + + return $this; + } + + /** + * @return bool + */ + public function hasEndJoker() + { + return $this->endJoker; + } + + /** + * @param string $expr + * + * @return Regex + */ + public function prepend($expr) + { + $this->pattern = $expr.$this->pattern; + + return $this; + } + + /** + * @param string $expr + * + * @return Regex + */ + public function append($expr) + { + $this->pattern .= $expr; + + return $this; + } + + /** + * @param array $replacements + * + * @return Regex + */ + public function replaceJokers($replacement) + { + $replace = function ($subject) use ($replacement) { + $subject = $subject[0]; + $replace = 0 === substr_count($subject, '\\') % 2; + + return $replace ? str_replace('.', $replacement, $subject) : $subject; + }; + + $this->pattern = preg_replace_callback('~[\\\\]*\\.~', $replace, $this->pattern); + + return $this; + } + + /** + * @param string $pattern + */ + private function parsePattern($pattern) + { + if ($this->startFlag = self::START_FLAG === substr($pattern, 0, 1)) { + $pattern = substr($pattern, 1); + } + + if ($this->startJoker = self::JOKER === substr($pattern, 0, 2)) { + $pattern = substr($pattern, 2); + } + + if ($this->endFlag = (self::END_FLAG === substr($pattern, -1) && self::ESCAPING !== substr($pattern, -2, -1))) { + $pattern = substr($pattern, 0, -1); + } + + if ($this->endJoker = (self::JOKER === substr($pattern, -2) && self::ESCAPING !== substr($pattern, -3, -2))) { + $pattern = substr($pattern, 0, -2); + } + + $this->pattern = $pattern; + } +} diff --git a/src/Symfony/Component/Finder/Expression/ValueInterface.php b/src/Symfony/Component/Finder/Expression/ValueInterface.php new file mode 100644 index 0000000000000..aca28f4bad894 --- /dev/null +++ b/src/Symfony/Component/Finder/Expression/ValueInterface.php @@ -0,0 +1,46 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Expression; + +/** + * @author Jean-François Simon + */ +interface ValueInterface +{ + /** + * Renders string representation of expression. + * + * @return string + */ + function render(); + + /** + * Renders string representation of pattern. + * + * @return string + */ + function renderPattern(); + + /** + * Returns value case sensitivity. + * + * @return bool + */ + function isCaseSensitive(); + + /** + * Returns expression type. + * + * @return int + */ + function getType(); +} diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php index 489a6f8b9a988..63fa6e70f7f75 100644 --- a/src/Symfony/Component/Finder/Finder.php +++ b/src/Symfony/Component/Finder/Finder.php @@ -11,6 +11,11 @@ namespace Symfony\Component\Finder; +use Symfony\Component\Finder\Adapter\AdapterInterface; +use Symfony\Component\Finder\Adapter\GnuFindAdapter; +use Symfony\Component\Finder\Adapter\PhpAdapter; +use Symfony\Component\Finder\Exception\ExceptionInterface; + /** * Finder allows to build rules to find files and directories. * @@ -46,6 +51,7 @@ class Finder implements \IteratorAggregate, \Countable private $iterators = array(); private $contains = array(); private $notContains = array(); + private $adapters = array(); private static $vcsPatterns = array('.svn', '_svn', 'CVS', '_darcs', '.arch-params', '.monotone', '.bzr', '.git', '.hg'); @@ -55,6 +61,9 @@ class Finder implements \IteratorAggregate, \Countable public function __construct() { $this->ignore = static::IGNORE_VCS_FILES | static::IGNORE_DOT_FILES; + + $this->register(new GnuFindAdapter()); + $this->register(new PhpAdapter(), -50); } /** @@ -69,6 +78,48 @@ public static function create() return new static(); } + /** + * Registers a finder engine implementation. + * + * @param AdapterInterface $adapter An adapter instance + * @param int $priority Highest is selected first + * + * @return Finder The current Finder instance + */ + public function register(Adapter\AdapterInterface $adapter, $priority = 0) + { + $this->adapters[$adapter->getName()] = array( + 'adapter' => $adapter, + 'priority' => $priority, + ); + + return $this->sortAdapters(); + } + + /** + * Removes all adapters registered in the finder. + * + * @return Finder The current Finder instance + */ + public function removeAdapters() + { + $this->adapters = array(); + + return $this; + } + + /** + * Returns registered adapters ordered by priority without extra information. + * + * @return AdapterInterface[] + */ + public function getAdapters() + { + return array_values(array_map(function(array $adapter) { + return $adapter['adapter']; + }, $this->adapters)); + } + /** * Restricts the matching to directories only. * @@ -569,27 +620,25 @@ public function count() return iterator_count($this->getIterator()); } - private function searchInDirectory($dir) + /* + * @return Finder The current Finder instance + */ + private function sortAdapters() { - $flags = \RecursiveDirectoryIterator::SKIP_DOTS; - - if ($this->followLinks) { - $flags |= \RecursiveDirectoryIterator::FOLLOW_SYMLINKS; - } - - $iterator = new \RecursiveIteratorIterator( - new Iterator\RecursiveDirectoryIterator($dir, $flags), - \RecursiveIteratorIterator::SELF_FIRST - ); - - if ($this->depths) { - $iterator = new Iterator\DepthRangeFilterIterator($iterator, $this->depths); - } + uasort($this->adapters, function (array $a, array $b) { + return $a['priority'] > $b['priority'] ? -1 : 1; + }); - if ($this->mode) { - $iterator = new Iterator\FileTypeFilterIterator($iterator, $this->mode); - } + return $this; + } + /** + * @param $dir + * + * @return \Iterator + */ + private function searchInDirectory($dir) + { if (static::IGNORE_VCS_FILES === (static::IGNORE_VCS_FILES & $this->ignore)) { $this->exclude = array_merge($this->exclude, self::$vcsPatterns); } @@ -598,35 +647,42 @@ private function searchInDirectory($dir) $this->notNames[] = '/^\..+/'; } - if ($this->exclude) { - $iterator = new Iterator\ExcludeDirectoryFilterIterator($iterator, $this->exclude); - } - - if ($this->names || $this->notNames) { - $iterator = new Iterator\FilenameFilterIterator($iterator, $this->names, $this->notNames); - } - - if ($this->contains || $this->notContains) { - $iterator = new Iterator\FilecontentFilterIterator($iterator, $this->contains, $this->notContains); - } - - if ($this->sizes) { - $iterator = new Iterator\SizeRangeFilterIterator($iterator, $this->sizes); - } - - if ($this->dates) { - $iterator = new Iterator\DateRangeFilterIterator($iterator, $this->dates); - } + foreach ($this->adapters as $adapter) { + if (!$adapter['adapter']->isSupported()) { + continue; + } - if ($this->filters) { - $iterator = new Iterator\CustomFilterIterator($iterator, $this->filters); + try { + return $this + ->buildAdapter($adapter['adapter']) + ->searchInDirectory($dir); + } catch(ExceptionInterface $e) { + continue; + } } - if ($this->sort) { - $iteratorAggregate = new Iterator\SortableIterator($iterator, $this->sort); - $iterator = $iteratorAggregate->getIterator(); - } + throw new \RuntimeException('No supported adapter found.'); + } - return $iterator; + /** + * @param AdapterInterface $adapter + * + * @return AdapterInterface + */ + private function buildAdapter(AdapterInterface $adapter) + { + return $adapter + ->setFollowLinks($this->followLinks) + ->setDepths($this->depths) + ->setMode($this->mode) + ->setExclude($this->exclude) + ->setNames($this->names) + ->setNotNames($this->notNames) + ->setContains($this->contains) + ->setNotContains($this->notContains) + ->setSizes($this->sizes) + ->setDates($this->dates) + ->setFilters($this->filters) + ->setSort($this->sort); } } diff --git a/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php b/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php index 832125393f1ae..77a9f45f2dfa5 100644 --- a/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php +++ b/src/Symfony/Component/Finder/Iterator/DepthRangeFilterIterator.php @@ -24,31 +24,11 @@ class DepthRangeFilterIterator extends FilterIterator * Constructor. * * @param \RecursiveIteratorIterator $iterator The Iterator to filter - * @param array $comparators An array of \NumberComparator instances + * @param int $minDepth The min depth + * @param int $maxDepth The max depth */ - public function __construct(\RecursiveIteratorIterator $iterator, array $comparators) + public function __construct(\RecursiveIteratorIterator $iterator, $minDepth = 0, $maxDepth = INF) { - $minDepth = 0; - $maxDepth = INF; - foreach ($comparators as $comparator) { - switch ($comparator->getOperator()) { - case '>': - $minDepth = $comparator->getTarget() + 1; - break; - case '>=': - $minDepth = $comparator->getTarget(); - break; - case '<': - $maxDepth = $comparator->getTarget() - 1; - break; - case '<=': - $maxDepth = $comparator->getTarget(); - break; - default: - $minDepth = $maxDepth = $comparator->getTarget(); - } - } - $this->minDepth = $minDepth; $iterator->setMaxDepth(INF === $maxDepth ? -1 : $maxDepth); diff --git a/src/Symfony/Component/Finder/Iterator/FilePathsIterator.php b/src/Symfony/Component/Finder/Iterator/FilePathsIterator.php new file mode 100644 index 0000000000000..5153ed301aeac --- /dev/null +++ b/src/Symfony/Component/Finder/Iterator/FilePathsIterator.php @@ -0,0 +1,123 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Iterator; + +use Symfony\Component\Finder\SplFileInfo; + +/** + * Iterate over shell command result. + * + * @author Jean-François Simon + */ +class FilePathsIterator extends \ArrayIterator +{ + /** + * @var string + */ + private $baseDir; + + /** + * @var int + */ + private $baseDirLength; + + /** + * @var string + */ + private $subPath; + + /** + * @var string + */ + private $subPathname; + + /** + * @param array $paths List of paths returned by shell command + * @param string $baseDir Base dir for relative path building + */ + public function __construct(array $paths, $baseDir) + { + $this->baseDir = $baseDir; + $this->baseDirLength = strlen($baseDir); + + parent::__construct($paths); + } + + /** + * @param string $name + * @param array $arguments + * + * @return mixed + */ + public function __call($name, array $arguments) + { + return call_user_func_array(array($this->current(), $name), $arguments); + } + + /** + * Return an instance of SplFileInfo with support for relative paths. + * + * @return SplFileInfo File information + */ + public function current() + { + return new SplFileInfo(parent::current(), $this->subPath, $this->subPathname); + } + + public function next() + { + parent::next(); + + $this->buildSubPath(); + } + + public function rewind() + { + parent::rewind(); + + $this->buildSubPath(); + } + + /** + * @return string + */ + public function getSubPath() + { + return $this->subPath; + } + + /** + * @return string + */ + public function getSubPathname() + { + return $this->subPathname; + } + + /** + * @param string $absolutePath + * + * @return null|string + */ + private function buildSubPath() + { + $absolutePath = parent::current(); + + if ($this->baseDir === substr($absolutePath, 0, $this->baseDirLength)) { + $this->subPathname = ltrim(substr($absolutePath, $this->baseDirLength), '/\\'); + $dir = dirname($this->subPathname); + $this->subPath = '.' === $dir ? '' : $dir; + } else { + $this->subPath = $this->subPathname = ''; + } + } +} diff --git a/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php b/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php index 109b5f00294bc..3c0f3aa70ef78 100644 --- a/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php +++ b/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php @@ -11,7 +11,7 @@ namespace Symfony\Component\Finder\Iterator; -use Symfony\Component\Finder\Glob; +use Symfony\Component\Finder\Expression\Expression; /** * FilenameFilterIterator filters files by patterns (a regexp, a glob, or a string). @@ -63,6 +63,6 @@ public function accept() */ protected function toRegex($str) { - return $this->isRegex($str) ? $str : Glob::toRegex($str); + return Expression::create($str)->getRegex()->render(); } } diff --git a/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php b/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php index 12584b186e00b..3a9dd55582859 100644 --- a/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php +++ b/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php @@ -11,6 +11,8 @@ namespace Symfony\Component\Finder\Iterator; +use Symfony\Component\Finder\Expression\Expression; + /** * MultiplePcreFilterIterator filters files using patterns (regexps, globs or strings). * @@ -52,20 +54,7 @@ public function __construct(\Iterator $iterator, array $matchPatterns, array $no */ protected function isRegex($str) { - if (preg_match('/^(.{3,}?)[imsxuADU]*$/', $str, $m)) { - $start = substr($m[1], 0, 1); - $end = substr($m[1], -1); - - if ($start === $end) { - return !preg_match('/[*?[:alnum:] \\\\]/', $start); - } - - if ($start === '{' && $end === '}') { - return true; - } - } - - return false; + return Expression::create($str)->isRegex(); } /** diff --git a/src/Symfony/Component/Finder/Shell/Command.php b/src/Symfony/Component/Finder/Shell/Command.php new file mode 100644 index 0000000000000..477c664e111f3 --- /dev/null +++ b/src/Symfony/Component/Finder/Shell/Command.php @@ -0,0 +1,245 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Shell; + +/** + * @author Jean-François Simon + */ +class Command +{ + /** + * @var Command|null + */ + private $parent; + + /** + * @var array + */ + private $bits; + + /** + * @var array + */ + private $labels; + + /** + * Constructor. + * + * @param Command $parent Parent command + */ + public function __construct(Command $parent = null) + { + $this->parent = $parent; + $this->bits = array(); + $this->labels = array(); + } + + /** + * Returns command as string. + * + * @return string + */ + public function __toString() + { + return $this->join(); + } + + /** + * Creates a new Command instance. + * + * @param Command $parent Parent command + * + * @return Command New Command instance + */ + public static function create(Command $parent = null) + { + return new self($parent); + } + + /** + * Escapes special chars from input. + * + * @param string $input A string to escape + * + * @return string The escaped string + */ + public static function escape($input) + { + return escapeshellcmd($input); + } + + /** + * Quotes input. + * + * @param string $input An argument string + * + * @return string The quoted string + */ + public static function quote($input) + { + return escapeshellarg($input); + } + + /** + * Appends a string or a Command instance. + * + * @param string|Command $bit + * + * @return Command The current Command instance + */ + public function add($bit) + { + $this->bits[] = $bit; + + return $this; + } + + /** + * Prepends a string or a command instance. + * + * @param string|Command $bit + * + * @return Command The current Command instance + */ + public function top($bit) + { + array_unshift($this->bits, $bit); + + foreach ($this->labels as $label => $index) { + $this->labels[$label] += 1; + } + + return $this; + } + + /** + * Appends an argument, will be quoted. + * + * @param string $arg + * + * @return Command The current Command instance + */ + public function arg($arg) + { + $this->bits[] = self::quote($arg); + + return $this; + } + + /** + * Appends escaped special command chars. + * + * @param string $esc + * + * @return Command The current Command instance + */ + public function cmd($esc) + { + $this->bits[] = self::escape($esc); + + return $this; + } + + /** + * Inserts a labeled command to feed later. + * + * @param string $label The unique label + * + * @return Command The current Command instance + * + * @throws \RuntimeException If label already exists + */ + public function ins($label) + { + if (isset($this->labels[$label])) { + throw new \RuntimeException('Label "'.$label.'" already exists.'); + } + + $this->bits[] = self::create($this); + $this->labels[$label] = count($this->bits)-1; + + return $this->bits[$this->labels[$label]]; + } + + /** + * Retrieves a previously labeled command. + * + * @param string $label + * + * @return Command The labeled command + */ + public function get($label) + { + if (!isset($this->labels[$label])) { + throw new \RuntimeException('Label "'.$label.'" does not exists.'); + } + + return $this->bits[$this->labels[$label]]; + } + + /** + * Returns parent command (if any). + * + * @return Command Parent command + * + * @throws \RuntimeException If command has no parent + */ + public function end() + { + if (null === $this->parent) { + throw new \RuntimeException('Calling end on root command dont makes sense.'); + } + + return $this->parent; + } + + /** + * Counts bits stored in command. + * + * @return int The bits count + */ + public function length() + { + return count($this->bits); + } + + /** + * Executes current command. + * + * @return array The command result + */ + public function execute() + { + exec($this->join(), $output, $code); + + if (0 !== $code) { + throw new \RuntimeException('Execution failed with return code: '.$code.'.'); + } + + return $output ?: array(); + } + + /** + * Joins bits. + * + * @return string + */ + public function join() + { + return implode(' ', array_filter( + array_map(function($bit) { + return $bit instanceof Command ? $bit->join() : ($bit ?: null); + }, $this->bits), + function($bit) { return null !== $bit; } + )); + } +} diff --git a/src/Symfony/Component/Finder/Shell/Shell.php b/src/Symfony/Component/Finder/Shell/Shell.php new file mode 100644 index 0000000000000..0c8bc7ef03e3f --- /dev/null +++ b/src/Symfony/Component/Finder/Shell/Shell.php @@ -0,0 +1,86 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Shell; + +/** + * @author Jean-François Simon + */ +class Shell +{ + const TYPE_UNIX = 1; + const TYPE_DARWIN = 2; + const TYPE_CYGWIN = 3; + const TYPE_WINDOWS = 4; + + /** + * @var string|null + */ + private $type; + + /** + * Returns guessed OS type. + * + * @return int + */ + public function getType() + { + if (null === $this->type) { + $this->type = $this->guessType(); + } + + return $this->type; + } + + /** + * Tests if a command is available. + * + * @param string $command + * + * @return bool + */ + public function testCommand($command) + { + if (self::TYPE_WINDOWS === $this->type) { + // todo: find a way to test if windows command exists + return true; + } + + // todo: find a better way (command could not be available) + exec('command -v '.$command, $output, $code); + + return 0 === $code && count($output) > 0; + } + + /** + * Guesses OS type. + * + * @return int + */ + private function guessType() + { + $os = strtolower(PHP_OS); + + if (false !== strpos($os, 'cygwin')) { + return self::TYPE_CYGWIN; + } + + if (false !== strpos($os, 'darwin')) { + return self::TYPE_DARWIN; + } + + if (0 === strpos($os, 'win')) { + return self::TYPE_WINDOWS; + } + + return self::TYPE_UNIX; + } +} diff --git a/src/Symfony/Component/Finder/Tests/Expression/ExpressionTest.php b/src/Symfony/Component/Finder/Tests/Expression/ExpressionTest.php new file mode 100644 index 0000000000000..c907d6a8d4d47 --- /dev/null +++ b/src/Symfony/Component/Finder/Tests/Expression/ExpressionTest.php @@ -0,0 +1,68 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Tests; + +use Symfony\Component\Finder\Expression\Expression; + +class ExpressionTest extends \PHPUnit_Framework_TestCase +{ + /** + * @dataProvider getTypeGuesserData + */ + public function testTypeGuesser($expr, $type) + { + $this->assertEquals($type, Expression::create($expr)->getType()); + } + + /** + * @dataProvider getCaseSensitiveData + */ + public function testCaseSensitive($expr, $isCaseSensitive) + { + $this->assertEquals($isCaseSensitive, Expression::create($expr)->isCaseSensitive()); + } + + /** + * @dataProvider getRegexRenderingData + */ + public function testRegexRendering($expr, $body) + { + $this->assertEquals($body, Expression::create($expr)->renderPattern()); + } + + public function getTypeGuesserData() + { + return array( + array('{foo}', Expression::TYPE_REGEX), + array('/foo/', Expression::TYPE_REGEX), + array('foo', Expression::TYPE_GLOB), + array('foo*', Expression::TYPE_GLOB), + ); + } + + public function getCaseSensitiveData() + { + return array( + array('{foo}m', true), + array('/foo/i', false), + array('foo*', true), + ); + } + + public function getRegexRenderingData() + { + return array( + array('{foo}m', 'foo'), + array('/foo/i', 'foo'), + ); + } +} diff --git a/src/Symfony/Component/Finder/Tests/GlobTest.php b/src/Symfony/Component/Finder/Tests/Expression/GlobTest.php similarity index 77% rename from src/Symfony/Component/Finder/Tests/GlobTest.php rename to src/Symfony/Component/Finder/Tests/Expression/GlobTest.php index 56077a10687ce..fbaeb0e237c82 100644 --- a/src/Symfony/Component/Finder/Tests/GlobTest.php +++ b/src/Symfony/Component/Finder/Tests/Expression/GlobTest.php @@ -11,21 +11,21 @@ namespace Symfony\Component\Finder\Tests; -use Symfony\Component\Finder\Glob; +use Symfony\Component\Finder\Expression\Expression; class GlobTest extends \PHPUnit_Framework_TestCase { /** * @dataProvider getToRegexData */ - public function testToRegex($glob, $match, $noMatch) + public function testGlobToRegex($glob, $match, $noMatch) { foreach ($match as $m) { - $this->assertRegExp(Glob::toRegex($glob), $m, '::toRegex() converts a glob to a regexp'); + $this->assertRegExp(Expression::create($glob)->getRegex()->render(), $m, '::toRegex() converts a glob to a regexp'); } foreach ($noMatch as $m) { - $this->assertNotRegExp(Glob::toRegex($glob), $m, '::toRegex() converts a glob to a regexp'); + $this->assertNotRegExp(Expression::create($glob)->getRegex()->render(), $m, '::toRegex() converts a glob to a regexp'); } } diff --git a/src/Symfony/Component/Finder/Tests/Expression/RegexTest.php b/src/Symfony/Component/Finder/Tests/Expression/RegexTest.php new file mode 100644 index 0000000000000..f252696a76256 --- /dev/null +++ b/src/Symfony/Component/Finder/Tests/Expression/RegexTest.php @@ -0,0 +1,143 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Tests; + +use Symfony\Component\Finder\Expression\Expression; + +class RegexTest extends \PHPUnit_Framework_TestCase +{ + /** + * @dataProvider getHasFlagsData + */ + public function testHasFlags($regex, $start, $end) + { + $expr = new Expression($regex); + + $this->assertEquals($start, $expr->getRegex()->hasStartFlag()); + $this->assertEquals($end, $expr->getRegex()->hasEndFlag()); + } + + /** + * @dataProvider getHasJokersData + */ + public function testHasJokers($regex, $start, $end) + { + $expr = new Expression($regex); + + $this->assertEquals($start, $expr->getRegex()->hasStartJoker()); + $this->assertEquals($end, $expr->getRegex()->hasEndJoker()); + } + + /** + * @dataProvider getSetFlagsData + */ + public function testSetFlags($regex, $start, $end, $expected) + { + $expr = new Expression($regex); + $expr->getRegex()->setStartFlag($start)->setEndFlag($end); + + $this->assertEquals($expected, $expr->render()); + } + + /** + * @dataProvider getSetJokersData + */ + public function testSetJokers($regex, $start, $end, $expected) + { + $expr = new Expression($regex); + $expr->getRegex()->setStartJoker($start)->setEndJoker($end); + + $this->assertEquals($expected, $expr->render()); + } + + public function testOptions() + { + $expr = new Expression('~abc~is'); + $expr->getRegex()->removeOption('i')->addOption('m'); + + $this->assertEquals('~abc~sm', $expr->render()); + } + + public function testMixFlagsAndJokers() + { + $expr = new Expression('~^.*abc.*$~is'); + + $expr->getRegex()->setStartFlag(false)->setEndFlag(false)->setStartJoker(false)->setEndJoker(false); + $this->assertEquals('~abc~is', $expr->render()); + + $expr->getRegex()->setStartFlag(true)->setEndFlag(true)->setStartJoker(true)->setEndJoker(true); + $this->assertEquals('~^.*abc.*$~is', $expr->render()); + } + + /** + * @dataProvider getReplaceJokersTestData + */ + public function testReplaceJokers($regex, $expected) + { + $expr = new Expression($regex); + $expr = $expr->getRegex()->replaceJokers('@'); + + $this->assertEquals($expected, $expr->renderPattern()); + } + + public function getHasFlagsData() + { + return array( + array('~^abc~', true, false), + array('~abc$~', false, true), + array('~abc~', false, false), + array('~^abc$~', true, true), + array('~^abc\\$~', true, false), + ); + } + + public function getHasJokersData() + { + return array( + array('~.*abc~', true, false), + array('~abc.*~', false, true), + array('~abc~', false, false), + array('~.*abc.*~', true, true), + array('~.*abc\\.*~', true, false), + ); + } + + public function getSetFlagsData() + { + return array( + array('~abc~', true, false, '~^abc~'), + array('~abc~', false, true, '~abc$~'), + array('~abc~', false, false, '~abc~'), + array('~abc~', true, true, '~^abc$~'), + ); + } + + public function getSetJokersData() + { + return array( + array('~abc~', true, false, '~.*abc~'), + array('~abc~', false, true, '~abc.*~'), + array('~abc~', false, false, '~abc~'), + array('~abc~', true, true, '~.*abc.*~'), + ); + } + + public function getReplaceJokersTestData() + { + return array( + array('~.abc~', '@abc'), + array('~\\.abc~', '\\.abc'), + array('~\\\\.abc~', '\\\\@abc'), + array('~\\\\\\.abc~', '\\\\\\.abc'), + ); + } +} diff --git a/src/Symfony/Component/Finder/Tests/FakeAdapter/DummyAdapter.php b/src/Symfony/Component/Finder/Tests/FakeAdapter/DummyAdapter.php new file mode 100644 index 0000000000000..26361f803612b --- /dev/null +++ b/src/Symfony/Component/Finder/Tests/FakeAdapter/DummyAdapter.php @@ -0,0 +1,58 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Tests\FakeAdapter; + +use Symfony\Component\Finder\Adapter\AbstractAdapter; +use Symfony\Component\Finder\Exception\AdapterFailureException; + +/** + * @author Jean-François Simon + */ +class DummyAdapter extends AbstractAdapter +{ + /** + * @var \Iterator + */ + private $iterator; + + /** + * @param \Iterator $iterator + */ + public function __construct(\Iterator $iterator) + { + $this->iterator = $iterator; + } + + /** + * {@inheritdoc} + */ + public function searchInDirectory($dir) + { + return $this->iterator; + } + + /** + * {@inheritdoc} + */ + public function isSupported() + { + return true; + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return 'yes'; + } +} diff --git a/src/Symfony/Component/Finder/Tests/FakeAdapter/FailingAdapter.php b/src/Symfony/Component/Finder/Tests/FakeAdapter/FailingAdapter.php new file mode 100644 index 0000000000000..00fc022fdf766 --- /dev/null +++ b/src/Symfony/Component/Finder/Tests/FakeAdapter/FailingAdapter.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Tests\FakeAdapter; + +use Symfony\Component\Finder\Adapter\AbstractAdapter; +use Symfony\Component\Finder\Exception\AdapterFailureException; + +/** + * @author Jean-François Simon + */ +class FailingAdapter extends AbstractAdapter +{ + /** + * {@inheritdoc} + */ + public function searchInDirectory($dir) + { + throw new AdapterFailureException($this); + } + + /** + * {@inheritdoc} + */ + public function isSupported() + { + return true; + } + + /** + * {@inheritdoc} + */ + function getName() + { + return 'failing'; + } +} diff --git a/src/Symfony/Component/Finder/Tests/FakeAdapter/NamedAdapter.php b/src/Symfony/Component/Finder/Tests/FakeAdapter/NamedAdapter.php new file mode 100644 index 0000000000000..2321195e94b0c --- /dev/null +++ b/src/Symfony/Component/Finder/Tests/FakeAdapter/NamedAdapter.php @@ -0,0 +1,57 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Tests\FakeAdapter; + +use Symfony\Component\Finder\Adapter\AbstractAdapter; + +/** + * @author Jean-François Simon + */ +class NamedAdapter extends AbstractAdapter +{ + /** + * @var string + */ + private $name; + + /** + * @param string $name + */ + public function __construct($name) + { + $this->name = $name; + } + + /** + * {@inheritdoc} + */ + public function searchInDirectory($dir) + { + return new \ArrayIterator(array()); + } + + /** + * {@inheritdoc} + */ + public function isSupported() + { + return true; + } + + /** + * {@inheritdoc} + */ + function getName() + { + return $this->name; + } +} diff --git a/src/Symfony/Component/Finder/Tests/FakeAdapter/UnsupportedAdapter.php b/src/Symfony/Component/Finder/Tests/FakeAdapter/UnsupportedAdapter.php new file mode 100644 index 0000000000000..d02a13e0328bd --- /dev/null +++ b/src/Symfony/Component/Finder/Tests/FakeAdapter/UnsupportedAdapter.php @@ -0,0 +1,44 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Tests\FakeAdapter; + +use Symfony\Component\Finder\Adapter\AbstractAdapter; + +/** + * @author Jean-François Simon + */ +class UnsupportedAdapter extends AbstractAdapter +{ + /** + * {@inheritdoc} + */ + public function searchInDirectory($dir) + { + return new \ArrayIterator(array()); + } + + /** + * {@inheritdoc} + */ + public function isSupported() + { + return false; + } + + /** + * {@inheritdoc} + */ + function getName() + { + return 'unsupported'; + } +} diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php index ec7db1ec06840..1baf457f7db60 100644 --- a/src/Symfony/Component/Finder/Tests/FinderTest.php +++ b/src/Symfony/Component/Finder/Tests/FinderTest.php @@ -12,6 +12,8 @@ namespace Symfony\Component\Finder\Tests; use Symfony\Component\Finder\Finder; +use Symfony\Component\Finder\Adapter; +use Symfony\Component\Finder\Tests\FakeAdapter; class FinderTest extends Iterator\RealIteratorTestCase { @@ -24,80 +26,106 @@ public static function setUpBeforeClass() self::$tmpDir = sys_get_temp_dir().'/symfony2_finder'; } - public function testCreate() + /** + * @dataProvider getAdaptersTestData + */ + public function testCreate($adapter) { $this->assertInstanceOf('Symfony\Component\Finder\Finder', Finder::create()); } - public function testDirectories() + /** + * @dataProvider getAdaptersTestData + */ + public function testDirectories($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->directories()); $this->assertIterator($this->toAbsolute(array('foo', 'toto')), $finder->in(self::$tmpDir)->getIterator()); - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->directories(); $finder->files(); $finder->directories(); $this->assertIterator($this->toAbsolute(array('foo', 'toto')), $finder->in(self::$tmpDir)->getIterator()); } - public function testFiles() + /** + * @dataProvider getAdaptersTestData + */ + public function testFiles($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->files()); $this->assertIterator($this->toAbsolute(array('foo/bar.tmp', 'test.php', 'test.py')), $finder->in(self::$tmpDir)->getIterator()); - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->files(); $finder->directories(); $finder->files(); $this->assertIterator($this->toAbsolute(array('foo/bar.tmp', 'test.php', 'test.py')), $finder->in(self::$tmpDir)->getIterator()); } - public function testDepth() + /** + * @dataProvider getAdaptersTestData + */ + public function testDepth($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->depth('< 1')); $this->assertIterator($this->toAbsolute(array('foo', 'test.php', 'test.py', 'toto')), $finder->in(self::$tmpDir)->getIterator()); - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->depth('<= 0')); $this->assertIterator($this->toAbsolute(array('foo', 'test.php', 'test.py', 'toto')), $finder->in(self::$tmpDir)->getIterator()); - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->depth('>= 1')); $this->assertIterator($this->toAbsolute(array('foo/bar.tmp')), $finder->in(self::$tmpDir)->getIterator()); - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->depth('< 1')->depth('>= 1'); $this->assertIterator(array(), $finder->in(self::$tmpDir)->getIterator()); } - public function testName() + /** + * @dataProvider getAdaptersTestData + */ + public function testName($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->name('*.php')); $this->assertIterator($this->toAbsolute(array('test.php')), $finder->in(self::$tmpDir)->getIterator()); - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->name('test.ph*'); $finder->name('test.py'); $this->assertIterator($this->toAbsolute(array('test.php', 'test.py')), $finder->in(self::$tmpDir)->getIterator()); + + $finder = $this->buildFinder($adapter); + $finder->name('~^test~i'); + $this->assertIterator($this->toAbsolute(array('test.php', 'test.py')), $finder->in(self::$tmpDir)->getIterator()); + + $finder = $this->buildFinder($adapter); + $finder->name('~\\.php$~i'); + $this->assertIterator($this->toAbsolute(array('test.php')), $finder->in(self::$tmpDir)->getIterator()); } - public function testNotName() + /** + * @dataProvider getAdaptersTestData + */ + public function testNotName($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->notName('*.php')); $this->assertIterator($this->toAbsolute(array('foo', 'foo/bar.tmp', 'test.py', 'toto')), $finder->in(self::$tmpDir)->getIterator()); - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->notName('*.php'); $finder->notName('*.py'); $this->assertIterator($this->toAbsolute(array('foo', 'foo/bar.tmp', 'toto')), $finder->in(self::$tmpDir)->getIterator()); - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->name('test.ph*'); $finder->name('test.py'); $finder->notName('*.php'); @@ -105,46 +133,72 @@ public function testNotName() $this->assertIterator(array(), $finder->in(self::$tmpDir)->getIterator()); } - public function testSize() + /** + * @dataProvider getRegexNameTestData + * + * @group regexName + */ + public function testRegexName($adapter, $regex) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); + $finder->name($regex); + $this->assertIterator($this->toAbsolute(array('test.py', 'test.php')), $finder->in(self::$tmpDir)->getIterator()); + } + + /** + * @dataProvider getAdaptersTestData + */ + public function testSize($adapter) + { + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->files()->size('< 1K')->size('> 500')); $this->assertIterator($this->toAbsolute(array('test.php')), $finder->in(self::$tmpDir)->getIterator()); } - public function testDate() + /** + * @dataProvider getAdaptersTestData + */ + public function testDate($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->files()->date('until last month')); $this->assertIterator($this->toAbsolute(array('foo/bar.tmp', 'test.php')), $finder->in(self::$tmpDir)->getIterator()); } - public function testExclude() + /** + * @dataProvider getAdaptersTestData + */ + public function testExclude($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->exclude('foo')); $this->assertIterator($this->toAbsolute(array('test.php', 'test.py', 'toto')), $finder->in(self::$tmpDir)->getIterator()); } - public function testIgnoreVCS() + /** + * @dataProvider getAdaptersTestData + */ + public function testIgnoreVCS($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->ignoreVCS(false)->ignoreDotFiles(false)); $this->assertIterator($this->toAbsolute(array('.git', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', '.bar', '.foo', '.foo/.bar')), $finder->in(self::$tmpDir)->getIterator()); - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->ignoreVCS(false)->ignoreVCS(false)->ignoreDotFiles(false); $this->assertIterator($this->toAbsolute(array('.git', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', '.bar', '.foo', '.foo/.bar')), $finder->in(self::$tmpDir)->getIterator()); - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->ignoreVCS(true)->ignoreDotFiles(false)); $this->assertIterator($this->toAbsolute(array('foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto', '.bar', '.foo', '.foo/.bar')), $finder->in(self::$tmpDir)->getIterator()); - } - public function testIgnoreDotFiles() + /** + * @dataProvider getAdaptersTestData + */ + public function testIgnoreDotFiles($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->ignoreDotFiles(false)->ignoreVCS(false)); $this->assertIterator($this->toAbsolute(array('.git', '.bar', '.foo', '.foo/.bar', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto')), $finder->in(self::$tmpDir)->getIterator()); @@ -152,75 +206,102 @@ public function testIgnoreDotFiles() $finder->ignoreDotFiles(false)->ignoreDotFiles(false)->ignoreVCS(false); $this->assertIterator($this->toAbsolute(array('.git', '.bar', '.foo', '.foo/.bar', 'foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto')), $finder->in(self::$tmpDir)->getIterator()); - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->ignoreDotFiles(true)->ignoreVCS(false)); $this->assertIterator($this->toAbsolute(array('foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto')), $finder->in(self::$tmpDir)->getIterator()); } - public function testSortByName() + /** + * @dataProvider getAdaptersTestData + */ + public function testSortByName($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->sortByName()); $this->assertIterator($this->toAbsolute(array('foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto')), $finder->in(self::$tmpDir)->getIterator()); } - public function testSortByType() + /** + * @dataProvider getAdaptersTestData + */ + public function testSortByType($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->sortByType()); $this->assertIterator($this->toAbsolute(array('foo', 'toto', 'foo/bar.tmp', 'test.php', 'test.py')), $finder->in(self::$tmpDir)->getIterator()); } - public function testSortByAccessedTime() + /** + * @dataProvider getAdaptersTestData + */ + public function testSortByAccessedTime($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->sortByAccessedTime()); $this->assertIterator($this->toAbsolute(array('foo/bar.tmp', 'test.php', 'toto', 'test.py', 'foo')), $finder->in(self::$tmpDir)->getIterator()); } - public function testSortByChangedTime() + /** + * @dataProvider getAdaptersTestData + */ + public function testSortByChangedTime($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->sortByChangedTime()); $this->assertIterator($this->toAbsolute(array('toto', 'test.py', 'test.php', 'foo/bar.tmp', 'foo')), $finder->in(self::$tmpDir)->getIterator()); } - public function testSortByModifiedTime() + /** + * @dataProvider getAdaptersTestData + */ + public function testSortByModifiedTime($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->sortByModifiedTime()); $this->assertIterator($this->toAbsolute(array('foo/bar.tmp', 'test.php', 'toto', 'test.py', 'foo')), $finder->in(self::$tmpDir)->getIterator()); } - public function testSort() + /** + * @dataProvider getAdaptersTestData + */ + public function testSort($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->sort(function (\SplFileInfo $a, \SplFileInfo $b) { return strcmp($a->getRealpath(), $b->getRealpath()); })); $this->assertIterator($this->toAbsolute(array('foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto')), $finder->in(self::$tmpDir)->getIterator()); } - public function testFilter() + /** + * @dataProvider getAdaptersTestData + */ + public function testFilter($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->filter(function (\SplFileInfo $f) { return preg_match('/test/', $f) > 0; })); $this->assertIterator($this->toAbsolute(array('test.php', 'test.py')), $finder->in(self::$tmpDir)->getIterator()); } - public function testFollowLinks() + /** + * @dataProvider getAdaptersTestData + */ + public function testFollowLinks($adapter) { if ('\\' == DIRECTORY_SEPARATOR) { return; } - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertSame($finder, $finder->followLinks()); $this->assertIterator($this->toAbsolute(array('foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto')), $finder->in(self::$tmpDir)->getIterator()); } - public function testIn() + /** + * @dataProvider getAdaptersTestData + */ + public function testIn($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); try { $finder->in('foobar'); $this->fail('->in() throws a \InvalidArgumentException if the directory does not exist'); @@ -228,15 +309,18 @@ public function testIn() $this->assertInstanceOf('InvalidArgumentException', $e, '->in() throws a \InvalidArgumentException if the directory does not exist'); } - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $iterator = $finder->files()->name('*.php')->depth('< 1')->in(array(self::$tmpDir, __DIR__))->getIterator(); - $this->assertIterator(array(self::$tmpDir.DIRECTORY_SEPARATOR.'test.php', __DIR__.DIRECTORY_SEPARATOR.'FinderTest.php', __DIR__.DIRECTORY_SEPARATOR.'bootstrap.php', __DIR__.DIRECTORY_SEPARATOR.'GlobTest.php'), $iterator); + $this->assertIterator(array(self::$tmpDir.DIRECTORY_SEPARATOR.'test.php', __DIR__.DIRECTORY_SEPARATOR.'FinderTest.php', __DIR__.DIRECTORY_SEPARATOR.'bootstrap.php'), $iterator); } - public function testGetIterator() + /** + * @dataProvider getAdaptersTestData + */ + public function testGetIterator($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); try { $finder->getIterator(); $this->fail('->getIterator() throws a \LogicException if the in() method has not been called'); @@ -244,7 +328,7 @@ public function testGetIterator() $this->assertInstanceOf('LogicException', $e, '->getIterator() throws a \LogicException if the in() method has not been called'); } - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $dirs = array(); foreach ($finder->directories()->in(self::$tmpDir) as $dir) { $dirs[] = (string) $dir; @@ -257,19 +341,22 @@ public function testGetIterator() $this->assertEquals($expected, $dirs, 'implements the \IteratorAggregate interface'); - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $this->assertEquals(2, iterator_count($finder->directories()->in(self::$tmpDir)), 'implements the \IteratorAggregate interface'); - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $a = iterator_to_array($finder->directories()->in(self::$tmpDir)); $a = array_values(array_map(function ($a) { return (string) $a; }, $a)); sort($a); $this->assertEquals($expected, $a, 'implements the \IteratorAggregate interface'); } - public function testRelativePath() + /** + * @dataProvider getAdaptersTestData + */ + public function testRelativePath($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->in(self::$tmpDir); @@ -284,12 +371,15 @@ public function testRelativePath() sort($ref); sort($paths); - $this->assertEquals($paths, $ref); + $this->assertEquals($ref, $paths); } - public function testRelativePathname() + /** + * @dataProvider getAdaptersTestData + */ + public function testRelativePathname($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->in(self::$tmpDir)->sortByName(); @@ -304,15 +394,18 @@ public function testRelativePathname() sort($paths); sort($ref); - $this->assertEquals($paths, $ref); + $this->assertEquals($ref, $paths); } - public function testAppendWithAFinder() + /** + * @dataProvider getAdaptersTestData + */ + public function testAppendWithAFinder($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->files()->in(self::$tmpDir.DIRECTORY_SEPARATOR.'foo'); - $finder1 = new Finder(); + $finder1 = $this->buildFinder($adapter); $finder1->directories()->in(self::$tmpDir); $finder->append($finder1); @@ -320,9 +413,12 @@ public function testAppendWithAFinder() $this->assertIterator($this->toAbsolute(array('foo', 'foo/bar.tmp', 'toto')), $finder->getIterator()); } - public function testAppendWithAnArray() + /** + * @dataProvider getAdaptersTestData + */ + public function testAppendWithAnArray($adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->files()->in(self::$tmpDir.DIRECTORY_SEPARATOR.'foo'); $finder->append($this->toAbsolute(array('foo', 'toto'))); @@ -391,10 +487,11 @@ protected function toAbsoluteFixtures($files) /** * @dataProvider getContainsTestData + * @group grep */ - public function testContains($matchPatterns, $noMatchPatterns, $expected) + public function testContains($adapter, $matchPatterns, $noMatchPatterns, $expected) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures') ->name('*.txt')->sortByName() ->contains($matchPatterns) @@ -403,26 +500,12 @@ public function testContains($matchPatterns, $noMatchPatterns, $expected) $this->assertIterator($this->toAbsoluteFixtures($expected), $finder); } - public function getContainsTestData() - { - return array( - array('', '', array()), - array('foo', 'bar', array()), - array('', 'foobar', array('dolor.txt', 'ipsum.txt', 'lorem.txt')), - array('lorem ipsum dolor sit amet', 'foobar', array('lorem.txt')), - array('sit', 'bar', array('dolor.txt', 'ipsum.txt', 'lorem.txt')), - array('dolor sit amet', '@^L@m', array('dolor.txt', 'ipsum.txt')), - array('/^lorem ipsum dolor sit amet$/m', 'foobar', array('lorem.txt')), - array('lorem', 'foobar', array('lorem.txt')), - - array('', 'lorem', array('dolor.txt', 'ipsum.txt')), - array('ipsum dolor sit amet', '/^IPSUM/m', array('lorem.txt')), - ); - } - - public function testContainsOnDirectory() + /** + * @dataProvider getAdaptersTestData + */ + public function testContainsOnDirectory(Adapter\AdapterInterface $adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->in(__DIR__) ->directories() ->name('Fixtures') @@ -430,9 +513,12 @@ public function testContainsOnDirectory() $this->assertIterator(array(), $finder); } - public function testNotContainsOnDirectory() + /** + * @dataProvider getAdaptersTestData + */ + public function testNotContainsOnDirectory(Adapter\AdapterInterface $adapter) { - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->in(__DIR__) ->directories() ->name('Fixtures') @@ -445,8 +531,10 @@ public function testNotContainsOnDirectory() * with inner FilesystemIterator in an ivalid state. * * @see https://bugs.php.net/bug.php?id=49104 + * + * @dataProvider getAdaptersTestData */ - public function testMultipleLocations() + public function testMultipleLocations(Adapter\AdapterInterface $adapter) { $locations = array( self::$tmpDir.'/', @@ -454,9 +542,108 @@ public function testMultipleLocations() ); // it is expected that there are test.py test.php in the tmpDir - $finder = new Finder(); + $finder = $this->buildFinder($adapter); $finder->in($locations)->depth('< 1')->name('test.php'); $this->assertEquals(1, count($finder)); } + + public function testAdaptersOrdering() + { + $finder = Finder::create() + ->removeAdapters() + ->register(new FakeAdapter\NamedAdapter('a'), 0) + ->register(new FakeAdapter\NamedAdapter('b'), -50) + ->register(new FakeAdapter\NamedAdapter('c'), 50) + ->register(new FakeAdapter\NamedAdapter('d'), -25) + ->register(new FakeAdapter\NamedAdapter('e'), 25); + + $this->assertEquals( + array('c', 'e', 'a', 'd', 'b'), + array_map(function(Adapter\AdapterInterface $adapter) { + return $adapter->getName(); + }, $finder->getAdapters()) + ); + } + + public function testAdaptersChaining() + { + $iterator = new \ArrayIterator(array()); + $filenames = $this->toAbsolute(array('foo', 'foo/bar.tmp', 'test.php', 'test.py', 'toto')); + foreach ($filenames as $file) { + $iterator->append(new \Symfony\Component\Finder\SplFileInfo($file, null, null)); + } + + $finder = Finder::create() + ->removeAdapters() + ->register(new FakeAdapter\UnsupportedAdapter(), 3) + ->register(new FakeAdapter\FailingAdapter(), 2) + ->register(new FakeAdapter\DummyAdapter($iterator), 1); + + $this->assertIterator($filenames, $finder->in(sys_get_temp_dir())->getIterator()); + } + + public function getAdaptersTestData() + { + return array_map( + function ($adapter) { return array($adapter); }, + $this->getValidAdapters() + ); + } + + public function getContainsTestData() + { + $tests = array( + array('', '', array()), + array('foo', 'bar', array()), + array('', 'foobar', array('dolor.txt', 'ipsum.txt', 'lorem.txt')), + array('lorem ipsum dolor sit amet', 'foobar', array('lorem.txt')), + array('sit', 'bar', array('dolor.txt', 'ipsum.txt', 'lorem.txt')), + array('dolor sit amet', '@^L@m', array('dolor.txt', 'ipsum.txt')), + array('/^lorem ipsum dolor sit amet$/m', 'foobar', array('lorem.txt')), + array('lorem', 'foobar', array('lorem.txt')), + + array('', 'lorem', array('dolor.txt', 'ipsum.txt')), + array('ipsum dolor sit amet', '/^IPSUM/m', array('lorem.txt')), + ); + + return $this->buildTestData($tests); + } + + public function getRegexNameTestData() + { + $tests = array( + array('~.+\\.p.+~i'), + array('~t.*s~i'), + ); + + return $this->buildTestData($tests); + } + + private function buildFinder(Adapter\AdapterInterface $adapter) + { + return Finder::create() + ->removeAdapters() + ->register($adapter); + } + + private function getValidAdapters() + { + return array_filter( + array(new Adapter\GnuFindAdapter(), new Adapter\PhpAdapter()), + function (Adapter\AdapterInterface $adapter) { return $adapter->isSupported(); } + ); + } + + private function buildTestData(array $tests) + { + $data = array(); + foreach ($this->getValidAdapters() as $adapter) { + foreach ($tests as $test) { + $data[] = array_merge(array($adapter), $test); + } + } + + return $data; + } } diff --git a/src/Symfony/Component/Finder/Tests/Iterator/DepthRangeIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/DepthRangeIteratorTest.php index 43ad4599496c5..68c81e1168a24 100644 --- a/src/Symfony/Component/Finder/Tests/Iterator/DepthRangeIteratorTest.php +++ b/src/Symfony/Component/Finder/Tests/Iterator/DepthRangeIteratorTest.php @@ -19,11 +19,11 @@ class DepthRangeFilterIteratorTest extends RealIteratorTestCase /** * @dataProvider getAcceptData */ - public function testAccept($size, $expected) + public function testAccept($minDepth, $maxDepth, $expected) { $inner = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->getAbsolutePath(''), \FilesystemIterator::SKIP_DOTS), \RecursiveIteratorIterator::SELF_FIRST); - $iterator = new DepthRangeFilterIterator($inner, $size); + $iterator = new DepthRangeFilterIterator($inner, $minDepth, $maxDepth); $actual = array_keys(iterator_to_array($iterator)); sort($expected); @@ -34,11 +34,11 @@ public function testAccept($size, $expected) public function getAcceptData() { return array( - array(array(new NumberComparator('< 1')), array($this->getAbsolutePath('/.git'), $this->getAbsolutePath('/test.py'), $this->getAbsolutePath('/foo'), $this->getAbsolutePath('/test.php'), $this->getAbsolutePath('/toto'), $this->getAbsolutePath('/.foo'), $this->getAbsolutePath('/.bar'))), - array(array(new NumberComparator('<= 1')), array($this->getAbsolutePath('/.git'), $this->getAbsolutePath('/test.py'), $this->getAbsolutePath('/foo'), $this->getAbsolutePath('/foo/bar.tmp'), $this->getAbsolutePath('/test.php'), $this->getAbsolutePath('/toto'), $this->getAbsolutePath('/.foo'), $this->getAbsolutePath('/.foo/.bar'), $this->getAbsolutePath('/.bar'))), - array(array(new NumberComparator('> 1')), array()), - array(array(new NumberComparator('>= 1')), array($this->getAbsolutePath('/foo/bar.tmp'), $this->getAbsolutePath('/.foo/.bar'))), - array(array(new NumberComparator('1')), array($this->getAbsolutePath('/foo/bar.tmp'), $this->getAbsolutePath('/.foo/.bar'))), + array(0, 0, array($this->getAbsolutePath('/.git'), $this->getAbsolutePath('/test.py'), $this->getAbsolutePath('/foo'), $this->getAbsolutePath('/test.php'), $this->getAbsolutePath('/toto'), $this->getAbsolutePath('/.foo'), $this->getAbsolutePath('/.bar'))), + array(0, 1, array($this->getAbsolutePath('/.git'), $this->getAbsolutePath('/test.py'), $this->getAbsolutePath('/foo'), $this->getAbsolutePath('/foo/bar.tmp'), $this->getAbsolutePath('/test.php'), $this->getAbsolutePath('/toto'), $this->getAbsolutePath('/.foo'), $this->getAbsolutePath('/.foo/.bar'), $this->getAbsolutePath('/.bar'))), + array(2, INF, array()), + array(1, INF, array($this->getAbsolutePath('/foo/bar.tmp'), $this->getAbsolutePath('/.foo/.bar'))), + array(1, 1, array($this->getAbsolutePath('/foo/bar.tmp'), $this->getAbsolutePath('/.foo/.bar'))), ); } diff --git a/src/Symfony/Component/Finder/Tests/Iterator/FilePathsIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/FilePathsIteratorTest.php new file mode 100644 index 0000000000000..c60a90656a550 --- /dev/null +++ b/src/Symfony/Component/Finder/Tests/Iterator/FilePathsIteratorTest.php @@ -0,0 +1,66 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Finder\Tests\Iterator; + +use Symfony\Component\Finder\Iterator\FilePathsIterator; + +class FilePathsIteratorTest extends RealIteratorTestCase +{ + /** + * @dataProvider getSubPathData + */ + public function testSubPath($baseDir, array $paths, array $subPaths, array $subPathnames) + { + $iterator = new FilePathsIterator($paths, $baseDir); + + foreach ($iterator as $index => $file) { + $this->assertEquals($paths[$index], $file->getPathname()); + $this->assertEquals($subPaths[$index], $iterator->getSubPath()); + $this->assertEquals($subPathnames[$index], $iterator->getSubPathname()); + } + } + + public function getSubPathData() + { + $tmpDir = sys_get_temp_dir().'/symfony2_finder'; + + return array( + array( + $tmpDir, + array( // paths + $tmpDir.DIRECTORY_SEPARATOR.'.git', + $tmpDir.DIRECTORY_SEPARATOR.'test.py', + $tmpDir.DIRECTORY_SEPARATOR.'foo', + $tmpDir.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'bar.tmp', + $tmpDir.DIRECTORY_SEPARATOR.'test.php', + $tmpDir.DIRECTORY_SEPARATOR.'toto' + ), + array( // subPaths + '', + '', + '', + 'foo', + '', + '' + ), + array( // subPathnames + '.git', + 'test.py', + 'foo', + 'foo'.DIRECTORY_SEPARATOR.'bar.tmp', + 'test.php', + 'toto' + ), + ), + ); + } +} diff --git a/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php b/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php index 8810ce757d25a..226469b4e7a93 100644 --- a/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php +++ b/src/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php @@ -15,7 +15,9 @@ abstract class IteratorTestCase extends \PHPUnit_Framework_TestCase { protected function assertIterator($expected, \Traversable $iterator) { - $values = array_map(function (\SplFileInfo $fileinfo) { return $fileinfo->getPathname(); }, iterator_to_array($iterator)); + // set iterator_to_array $use_key to false to avoid values merge + // this made FinderTest::testAppendWithAnArray() failed with GnuFinderAdapter + $values = array_map(function (\SplFileInfo $fileinfo) { return $fileinfo->getPathname(); }, iterator_to_array($iterator, false)); sort($values); sort($expected); From c1e77d63d720565e8bb826f76baf61e6e0422b39 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 4 Oct 2012 15:24:19 +0200 Subject: [PATCH 083/975] [Finder] tweaked previous merge --- .../Finder/Adapter/GnuFindAdapter.php | 3 +-- src/Symfony/Component/Finder/CHANGELOG.md | 5 +++++ src/Symfony/Component/Finder/Finder.php | 6 +++--- src/Symfony/Component/Finder/Shell/Shell.php | 5 +++++ .../Component/Finder/Tests/FinderTest.php | 18 +++++++++--------- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php b/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php index 98ac30f9b2d01..6bd8ed9a2d61a 100644 --- a/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php +++ b/src/Symfony/Component/Finder/Adapter/GnuFindAdapter.php @@ -124,8 +124,7 @@ public function searchInDirectory($dir) */ public function isSupported() { - return $this->shell->getType() !== Shell::TYPE_WINDOWS - && $this->shell->testCommand('find'); + return $this->shell->getType() === Shell::TYPE_UNIX && $this->shell->testCommand('find'); } /** diff --git a/src/Symfony/Component/Finder/CHANGELOG.md b/src/Symfony/Component/Finder/CHANGELOG.md index b47b26a1b3c03..161652971e761 100644 --- a/src/Symfony/Component/Finder/CHANGELOG.md +++ b/src/Symfony/Component/Finder/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2.2.0 +----- + + * added finder adapters to improve performance on specific platforms + 2.1.0 ----- diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php index d3603e0337e80..160964429b48f 100644 --- a/src/Symfony/Component/Finder/Finder.php +++ b/src/Symfony/Component/Finder/Finder.php @@ -62,8 +62,8 @@ public function __construct() { $this->ignore = static::IGNORE_VCS_FILES | static::IGNORE_DOT_FILES; - $this->register(new GnuFindAdapter()); - $this->register(new PhpAdapter(), -50); + $this->addAdapter(new GnuFindAdapter()); + $this->addAdapter(new PhpAdapter(), -50); } /** @@ -86,7 +86,7 @@ public static function create() * * @return Finder The current Finder instance */ - public function register(Adapter\AdapterInterface $adapter, $priority = 0) + public function addAdapter(Adapter\AdapterInterface $adapter, $priority = 0) { $this->adapters[$adapter->getName()] = array( 'adapter' => $adapter, diff --git a/src/Symfony/Component/Finder/Shell/Shell.php b/src/Symfony/Component/Finder/Shell/Shell.php index 0c8bc7ef03e3f..a03e64366db66 100644 --- a/src/Symfony/Component/Finder/Shell/Shell.php +++ b/src/Symfony/Component/Finder/Shell/Shell.php @@ -20,6 +20,7 @@ class Shell const TYPE_DARWIN = 2; const TYPE_CYGWIN = 3; const TYPE_WINDOWS = 4; + const TYPE_BSD = 5; /** * @var string|null @@ -77,6 +78,10 @@ private function guessType() return self::TYPE_DARWIN; } + if (false !== strpos($os, 'bsd')) { + return self::TYPE_BSD; + } + if (0 === strpos($os, 'win')) { return self::TYPE_WINDOWS; } diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php index 1baf457f7db60..e6f6c8b701561 100644 --- a/src/Symfony/Component/Finder/Tests/FinderTest.php +++ b/src/Symfony/Component/Finder/Tests/FinderTest.php @@ -552,11 +552,11 @@ public function testAdaptersOrdering() { $finder = Finder::create() ->removeAdapters() - ->register(new FakeAdapter\NamedAdapter('a'), 0) - ->register(new FakeAdapter\NamedAdapter('b'), -50) - ->register(new FakeAdapter\NamedAdapter('c'), 50) - ->register(new FakeAdapter\NamedAdapter('d'), -25) - ->register(new FakeAdapter\NamedAdapter('e'), 25); + ->addAdapter(new FakeAdapter\NamedAdapter('a'), 0) + ->addAdapter(new FakeAdapter\NamedAdapter('b'), -50) + ->addAdapter(new FakeAdapter\NamedAdapter('c'), 50) + ->addAdapter(new FakeAdapter\NamedAdapter('d'), -25) + ->addAdapter(new FakeAdapter\NamedAdapter('e'), 25); $this->assertEquals( array('c', 'e', 'a', 'd', 'b'), @@ -576,9 +576,9 @@ public function testAdaptersChaining() $finder = Finder::create() ->removeAdapters() - ->register(new FakeAdapter\UnsupportedAdapter(), 3) - ->register(new FakeAdapter\FailingAdapter(), 2) - ->register(new FakeAdapter\DummyAdapter($iterator), 1); + ->addAdapter(new FakeAdapter\UnsupportedAdapter(), 3) + ->addAdapter(new FakeAdapter\FailingAdapter(), 2) + ->addAdapter(new FakeAdapter\DummyAdapter($iterator), 1); $this->assertIterator($filenames, $finder->in(sys_get_temp_dir())->getIterator()); } @@ -624,7 +624,7 @@ private function buildFinder(Adapter\AdapterInterface $adapter) { return Finder::create() ->removeAdapters() - ->register($adapter); + ->addAdapter($adapter); } private function getValidAdapters() From be62fcca7f9c658f1abd52cb5371a9768a9e0907 Mon Sep 17 00:00:00 2001 From: boombatower Date: Fri, 7 Sep 2012 00:03:48 -0700 Subject: [PATCH 084/975] [process] provide a restart method. --- src/Symfony/Component/Process/Process.php | 38 +++++++++++++++++++ .../Component/Process/Tests/ProcessTest.php | 18 +++++++++ 2 files changed, 56 insertions(+) diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index cd1e8b42155a2..e4b4640074a87 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -143,6 +143,20 @@ public function __destruct() $this->stop(); } + public function __clone() + { + $this->exitcode = null; + $this->fallbackExitcode = null; + $this->processInformation = null; + $this->stdout = null; + $this->stderr = null; + $this->pipes = null; + $this->process = null; + $this->status = self::STATUS_READY; + $this->fileHandles = null; + $this->readBytes = null; + } + /** * Runs the process. * @@ -300,6 +314,30 @@ public function start($callback = null) $this->updateStatus(); } + /** + * Restarts the process by cloning and invoking start(). + * + * @param callable $callback A PHP callback to run whenever there is some + * output available on STDOUT or STDERR + * + * @return Process The new process. + * + * @throws \RuntimeException When process can't be launch or is stopped + * @throws \RuntimeException When process is already running + * @see start() + */ + public function restart($callback = null) + { + if ($this->isRunning()) { + throw new \RuntimeException('Process is already running'); + } + + $process = clone $this; + $process->start($callback); + + return $process; + } + /** * Waits for the process to terminate. * diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php index 64f929cc20d61..5548cb7a696d6 100644 --- a/src/Symfony/Component/Process/Tests/ProcessTest.php +++ b/src/Symfony/Component/Process/Tests/ProcessTest.php @@ -155,6 +155,24 @@ public function testStop() } } + public function testRestart() + { + $process1 = new Process('php -r "echo getmypid();"'); + $process1->run(); + $process2 = $process1->restart(); + + usleep(300000); // wait for output + + // Ensure that both processed finished and the output is numeric + $this->assertFalse($process1->isRunning()); + $this->assertFalse($process2->isRunning()); + $this->assertTrue(is_numeric($process1->getOutput())); + $this->assertTrue(is_numeric($process2->getOutput())); + + // Ensure that restart returned a new process by check that the output is different + $this->assertNotEquals($process1->getOutput(), $process2->getOutput()); + } + public function testPhpDeadlock() { $this->markTestSkipped('Can course php to hang'); From d55546675a5e77ff6eb7032dcfc86751ce32b22f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 4 Oct 2012 16:21:40 +0200 Subject: [PATCH 085/975] [Process] updated CHANGELOG --- src/Symfony/Component/Process/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Symfony/Component/Process/CHANGELOG.md b/src/Symfony/Component/Process/CHANGELOG.md index 8c73d54f69592..3826ebf152a4b 100644 --- a/src/Symfony/Component/Process/CHANGELOG.md +++ b/src/Symfony/Component/Process/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2.2.0 +----- + + * added Process:restart() + 2.1.0 ----- From 32a850230417843f8f229a1900d05587967ab58b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 4 Oct 2012 16:23:11 +0200 Subject: [PATCH 086/975] [Process] fixed phpdoc --- src/Symfony/Component/Process/Process.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php index a6771c9f80550..1e82752feba29 100644 --- a/src/Symfony/Component/Process/Process.php +++ b/src/Symfony/Component/Process/Process.php @@ -327,15 +327,18 @@ public function start($callback = null) } /** - * Restarts the process by cloning and invoking start(). + * Restarts the process. + * + * Be warned that the process is cloned before being started. * * @param callable $callback A PHP callback to run whenever there is some * output available on STDOUT or STDERR * - * @return Process The new process. + * @return Process The new process * * @throws \RuntimeException When process can't be launch or is stopped * @throws \RuntimeException When process is already running + * * @see start() */ public function restart($callback = null) From 0f67dca1feb5ec1ad686514e5d311ba94bababe9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 4 Oct 2012 16:37:34 +0200 Subject: [PATCH 087/975] [Process] fixed a unit test --- .../Process/Tests/AbstractProcessTest.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php index d2978f6e8fff3..00e3b0a15a919 100644 --- a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php +++ b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php @@ -242,20 +242,20 @@ public function testProcessWithTermSignal() public function testRestart() { - $process1 = new Process('php -r "echo getmypid();"'); - $process1->run(); - $process2 = $process1->restart(); + $process1 = $this->getProcess('php -r "echo getmypid();"'); + $process1->run(); + $process2 = $process1->restart(); - usleep(300000); // wait for output + usleep(300000); // wait for output - // Ensure that both processed finished and the output is numeric - $this->assertFalse($process1->isRunning()); - $this->assertFalse($process2->isRunning()); - $this->assertTrue(is_numeric($process1->getOutput())); - $this->assertTrue(is_numeric($process2->getOutput())); + // Ensure that both processed finished and the output is numeric + $this->assertFalse($process1->isRunning()); + $this->assertFalse($process2->isRunning()); + $this->assertTrue(is_numeric($process1->getOutput())); + $this->assertTrue(is_numeric($process2->getOutput())); - // Ensure that restart returned a new process by check that the output is different - $this->assertNotEquals($process1->getOutput(), $process2->getOutput()); + // Ensure that restart returned a new process by check that the output is different + $this->assertNotEquals($process1->getOutput(), $process2->getOutput()); } public function testPhpDeadlock() From 2be47200e0a017263e259b451b05b0ba9be84967 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 4 Oct 2012 17:28:41 +0200 Subject: [PATCH 088/975] [HttpKernel] fixed the traceable event dispatcher when an event of a name is dispatched when an event of the same name is already being dispatched --- .../Debug/TraceableEventDispatcher.php | 28 +++++++++++++------ .../Debug/TraceableEventDispatcherTest.php | 14 ++++++++++ 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php index 7bf8bf8d82ad9..10fdd16305a5d 100644 --- a/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php +++ b/src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php @@ -37,6 +37,7 @@ class TraceableEventDispatcher implements EventDispatcherInterface, TraceableEve private $dispatcher; private $wrappedListeners; private $firstCalledEvent; + private $id; /** * Constructor. @@ -118,6 +119,12 @@ public function hasListeners($eventName = null) */ public function dispatch($eventName, Event $event = null) { + if (null === $event) { + $event = new Event(); + } + + $this->id = spl_object_hash($event); + $this->preDispatch($eventName, $event); $e = $this->stopwatch->start($eventName, 'section'); @@ -126,6 +133,9 @@ public function dispatch($eventName, Event $event = null) $this->dispatcher->dispatch($eventName, $event); + // reset the id as another event might have been dispatched during the dispatching of this event + $this->id = spl_object_hash($event); + unset($this->firstCalledEvent[$eventName]); $e->stop(); @@ -342,17 +352,17 @@ private function getListenerAsString($listener) return '[?] '.var_export($listener, true); } - private function preDispatch($eventName, Event $event = null) + private function preDispatch($eventName, Event $event) { // wrap all listeners before they are called - $this->wrappedListeners[$eventName] = new \SplObjectStorage(); + $this->wrappedListeners[$this->id] = new \SplObjectStorage(); $listeners = $this->dispatcher->getListeners($eventName); foreach ($listeners as $listener) { $this->dispatcher->removeListener($eventName, $listener); $wrapped = $this->wrapListener($eventName, $listener); - $this->wrappedListeners[$eventName][$wrapped] = $listener; + $this->wrappedListeners[$this->id][$wrapped] = $listener; $this->dispatcher->addListener($eventName, $wrapped); } @@ -375,7 +385,7 @@ private function preDispatch($eventName, Event $event = null) } } - private function postDispatch($eventName, Event $event = null) + private function postDispatch($eventName, Event $event) { switch ($eventName) { case 'kernel.controller': @@ -400,12 +410,12 @@ private function postDispatch($eventName, Event $event = null) break; } - foreach ($this->wrappedListeners[$eventName] as $wrapped) { + foreach ($this->wrappedListeners[$this->id] as $wrapped) { $this->dispatcher->removeListener($eventName, $wrapped); - $this->dispatcher->addListener($eventName, $this->wrappedListeners[$eventName][$wrapped]); + $this->dispatcher->addListener($eventName, $this->wrappedListeners[$this->id][$wrapped]); } - unset($this->wrappedListeners[$eventName]); + unset($this->wrappedListeners[$this->id]); } private function wrapListener($eventName, $listener) @@ -428,8 +438,8 @@ private function wrapListener($eventName, $listener) private function unwrapListener($listener, $eventName) { // get the original listener - if (is_object($listener) && isset($this->wrappedListeners[$eventName][$listener])) { - return $this->wrappedListeners[$eventName][$listener]; + if (is_object($listener) && isset($this->wrappedListeners[$this->id][$listener])) { + return $this->wrappedListeners[$this->id][$listener]; } return $listener; diff --git a/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php b/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php index c05f7efa9ed19..2177f2bbb46ef 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php @@ -145,6 +145,20 @@ public function testDispatchCallListeners() $this->assertEquals(array('foo1', 'foo2'), $called); } + public function testDispatchNested() + { + $dispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch()); + $loop = 1; + $dispatcher->addListener('foo', $listener1 = function () use ($dispatcher, &$loop) { + ++$loop; + if (2 == $loop) { + $dispatcher->dispatch('foo'); + } + }); + + $dispatcher->dispatch('foo'); + } + public function testStopwatchSections() { $dispatcher = new TraceableEventDispatcher(new EventDispatcher(), $stopwatch = new Stopwatch()); From 63a228c45613bbe9653d72d4278040c37f21175e Mon Sep 17 00:00:00 2001 From: Chris Heng Date: Thu, 4 Oct 2012 20:45:19 +0800 Subject: [PATCH 089/975] Map normalized header names to original capitalization --- .../Component/HttpFoundation/Response.php | 2 +- .../HttpFoundation/ResponseHeaderBag.php | 32 +++++++++++-- .../Tests/ResponseHeaderBagTest.php | 45 +++++++++++++++++++ 3 files changed, 74 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index b36d7793f6908..03d45bcc12039 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -259,7 +259,7 @@ public function sendHeaders() header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText)); // headers - foreach ($this->headers->all() as $name => $values) { + foreach ($this->headers->allPreserveCase() as $name => $values) { foreach ($values as $value) { header($name.': '.$value, false); } diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php index c27d8116083ab..531e003fb7bff 100644 --- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php +++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php @@ -36,6 +36,11 @@ class ResponseHeaderBag extends HeaderBag */ protected $cookies = array(); + /** + * @var array + */ + protected $headerNames = array(); + /** * Constructor. * @@ -48,7 +53,7 @@ public function __construct(array $headers = array()) parent::__construct($headers); if (!isset($this->headers['cache-control'])) { - $this->set('cache-control', ''); + $this->set('Cache-Control', ''); } } @@ -65,6 +70,16 @@ public function __toString() return parent::__toString().$cookies; } + /** + * Returns the headers, with original capitalizations. + * + * @return array An array of headers + */ + public function allPreserveCase() + { + return array_combine($this->headerNames, $this->headers); + } + /** * {@inheritdoc} * @@ -72,10 +87,12 @@ public function __toString() */ public function replace(array $headers = array()) { + $this->headerNames = array(); + parent::replace($headers); if (!isset($this->headers['cache-control'])) { - $this->set('cache-control', ''); + $this->set('Cache-Control', ''); } } @@ -88,10 +105,14 @@ public function set($key, $values, $replace = true) { parent::set($key, $values, $replace); + $uniqueKey = strtr(strtolower($key), '_', '-'); + $this->headerNames[$uniqueKey] = $key; + // ensure the cache-control header has sensible defaults - if (in_array(strtr(strtolower($key), '_', '-'), array('cache-control', 'etag', 'last-modified', 'expires'))) { + if (in_array($uniqueKey, array('cache-control', 'etag', 'last-modified', 'expires'))) { $computed = $this->computeCacheControlValue(); $this->headers['cache-control'] = array($computed); + $this->headerNames['cache-control'] = 'Cache-Control'; $this->computedCacheControl = $this->parseCacheControl($computed); } } @@ -105,7 +126,10 @@ public function remove($key) { parent::remove($key); - if ('cache-control' === strtr(strtolower($key), '_', '-')) { + $uniqueKey = strtr(strtolower($key), '_', '-'); + unset($this->headerNames[$uniqueKey]); + + if ('cache-control' === $uniqueKey) { $this->computedCacheControl = array(); } } diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php index fc3d908cb130a..fd163d197d206 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php @@ -16,6 +16,51 @@ class ResponseHeaderBagTest extends \PHPUnit_Framework_TestCase { + /** + * @covers Symfony\Component\HttpFoundation\ResponseHeaderBag::allPreserveCase + * @dataProvider provideAllPreserveCase + */ + public function testAllPreserveCase($headers, $expected) + { + $bag = new ResponseHeaderBag($headers); + + $this->assertEquals($expected, $bag->allPreserveCase(), '->allPreserveCase() gets all input keys in original case'); + } + + public function provideAllPreserveCase() + { + return array( + array( + array('fOo' => 'BAR'), + array('fOo' => array('BAR'), 'Cache-Control' => array('no-cache')) + ), + array( + array('ETag' => 'xyzzy'), + array('ETag' => array('xyzzy'), 'Cache-Control' => array('private, must-revalidate')) + ), + array( + array('Content-MD5' => 'Q2hlY2sgSW50ZWdyaXR5IQ=='), + array('Content-MD5' => array('Q2hlY2sgSW50ZWdyaXR5IQ=='), 'Cache-Control' => array('no-cache')) + ), + array( + array('P3P' => 'CP="CAO PSA OUR"'), + array('P3P' => array('CP="CAO PSA OUR"'), 'Cache-Control' => array('no-cache')) + ), + array( + array('WWW-Authenticate' => 'Basic realm="WallyWorld"'), + array('WWW-Authenticate' => array('Basic realm="WallyWorld"'), 'Cache-Control' => array('no-cache')) + ), + array( + array('X-UA-Compatible' => 'IE=edge,chrome=1'), + array('X-UA-Compatible' => array('IE=edge,chrome=1'), 'Cache-Control' => array('no-cache')) + ), + array( + array('X-XSS-Protection' => '1; mode=block'), + array('X-XSS-Protection' => array('1; mode=block'), 'Cache-Control' => array('no-cache')) + ), + ); + } + public function testCacheControlHeader() { $bag = new ResponseHeaderBag(array()); From 63b480edb0bb668fda92d191e2e6e8883a6bb872 Mon Sep 17 00:00:00 2001 From: Ken Marfilla Date: Fri, 5 Oct 2012 10:05:02 +0800 Subject: [PATCH 090/975] [Console] fixed #5316 --- .../Component/Console/Command/Command.php | 22 +++++++-- .../Tests/Fixtures/application_asxml1.txt | 45 ++++++++++++++++++- .../Tests/Fixtures/application_asxml2.txt | 24 +++++++++- 3 files changed, 85 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php index 6c54d99d28f5f..e9af834ed37be 100644 --- a/src/Symfony/Component/Console/Command/Command.php +++ b/src/Symfony/Component/Console/Command/Command.php @@ -264,16 +264,20 @@ public function setCode(\Closure $code) /** * Merges the application definition with the command definition. + * + * @param Boolean $mergeArgs Whether to merge or not the Application definition arguments to Command definition arguments */ - private function mergeApplicationDefinition() + private function mergeApplicationDefinition($mergeArgs = true) { if (null === $this->application || true === $this->applicationDefinitionMerged) { return; } - $currentArguments = $this->definition->getArguments(); - $this->definition->setArguments($this->application->getDefinition()->getArguments()); - $this->definition->addArguments($currentArguments); + if ($mergeArgs) { + $currentArguments = $this->definition->getArguments(); + $this->definition->setArguments($this->application->getDefinition()->getArguments()); + $this->definition->addArguments($currentArguments); + } $this->definition->addOptions($this->application->getDefinition()->getOptions()); @@ -550,6 +554,11 @@ public function getHelper($name) */ public function asText() { + if ($this->application && !$this->applicationDefinitionMerged) { + $this->getSynopsis(); + $this->mergeApplicationDefinition(false); + } + $messages = array( 'Usage:', ' '.$this->getSynopsis(), @@ -579,6 +588,11 @@ public function asText() */ public function asXml($asDom = false) { + if ($this->application && !$this->applicationDefinitionMerged) { + $this->getSynopsis(); + $this->mergeApplicationDefinition(false); + } + $dom = new \DOMDocument('1.0', 'UTF-8'); $dom->formatOutput = true; $dom->appendChild($commandXML = $dom->createElement('command')); diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt index ce21a328699ee..452ce533d4aea 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt @@ -24,6 +24,27 @@ + + + + + + + @@ -68,7 +89,29 @@ afoobar - + + + + + + + + + diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt index 9e1f4a1db9a08..ef92f85cbfe07 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt @@ -9,7 +9,29 @@ afoobar - + + + + + + + + + From 0187a1ac9497428d934f50233f43538163117c01 Mon Sep 17 00:00:00 2001 From: "Johannes M. Schmitt" Date: Sat, 6 Oct 2012 14:13:41 +0200 Subject: [PATCH 091/975] adds two convenience methods for optional configuration sections --- .../DependencyInjection/Configuration.php | 32 ++++--------------- .../Builder/ArrayNodeDefinition.php | 28 ++++++++++++++++ 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index 48bf4dd23e739..4ff15f16e73d3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -88,19 +88,11 @@ private function addFormSection(ArrayNodeDefinition $rootNode) ->children() ->arrayNode('form') ->info('form configuration') - ->canBeUnset() - ->treatNullLike(array('enabled' => true)) - ->treatTrueLike(array('enabled' => true)) - ->children() - ->booleanNode('enabled')->defaultTrue()->end() - ->end() + ->canBeDisabled() ->end() ->arrayNode('csrf_protection') - ->canBeUnset() - ->treatNullLike(array('enabled' => true)) - ->treatTrueLike(array('enabled' => true)) + ->canBeDisabled() ->children() - ->booleanNode('enabled')->defaultTrue()->end() ->scalarNode('field_name')->defaultValue('_token')->end() ->end() ->end() @@ -114,12 +106,7 @@ private function addEsiSection(ArrayNodeDefinition $rootNode) ->children() ->arrayNode('esi') ->info('esi configuration') - ->canBeUnset() - ->treatNullLike(array('enabled' => true)) - ->treatTrueLike(array('enabled' => true)) - ->children() - ->booleanNode('enabled')->defaultTrue()->end() - ->end() + ->canBeDisabled() ->end() ->end() ; @@ -131,11 +118,10 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode) ->children() ->arrayNode('profiler') ->info('profiler configuration') - ->canBeUnset() + ->canBeDisabled() ->children() ->booleanNode('only_exceptions')->defaultFalse()->end() ->booleanNode('only_master_requests')->defaultFalse()->end() - ->booleanNode('enabled')->defaultTrue()->end() ->scalarNode('dsn')->defaultValue('file:%kernel.cache_dir%/profiler')->end() ->scalarNode('username')->defaultValue('')->end() ->scalarNode('password')->defaultValue('')->end() @@ -363,11 +349,8 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode) ->children() ->arrayNode('translator') ->info('translator configuration') - ->canBeUnset() - ->treatNullLike(array('enabled' => true)) - ->treatTrueLike(array('enabled' => true)) + ->canBeDisabled() ->children() - ->booleanNode('enabled')->defaultTrue()->end() ->scalarNode('fallback')->defaultValue('en')->end() ->end() ->end() @@ -381,11 +364,8 @@ private function addValidationSection(ArrayNodeDefinition $rootNode) ->children() ->arrayNode('validation') ->info('validation configuration') - ->canBeUnset() - ->treatNullLike(array('enabled' => true)) - ->treatTrueLike(array('enabled' => true)) + ->canBeDisabled() ->children() - ->booleanNode('enabled')->defaultTrue()->end() ->scalarNode('cache')->end() ->booleanNode('enable_annotations')->defaultFalse()->end() ->end() diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php index db530e9d47429..219eec3abda61 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php @@ -209,6 +209,34 @@ public function canBeUnset($allow = true) return $this; } + public function canBeEnabled() + { + $this + ->treatFalseLike(array('enabled' => false)) + ->treatTrueLike(array('enabled' => true)) + ->treatNullLike(array('enabled' => true)) + ->children() + ->booleanNode('enabled') + ->defaultFalse() + ; + + return $this; + } + + public function canBeDisabled() + { + $this + ->treatFalseLike(array('enabled' => false)) + ->treatTrueLike(array('enabled' => true)) + ->treatNullLike(array('enabled' => true)) + ->children() + ->booleanNode('enabled') + ->defaultTrue() + ; + + return $this; + } + /** * Disables the deep merging of the node. * From 36bbaf31ac87763af8f37bf8b8f1e0e3becf592e Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 6 Oct 2012 17:22:10 +0300 Subject: [PATCH 092/975] added entry to changelog --- src/Symfony/Component/Config/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Symfony/Component/Config/CHANGELOG.md b/src/Symfony/Component/Config/CHANGELOG.md index f6c219b1923fe..8426abd57bcef 100644 --- a/src/Symfony/Component/Config/CHANGELOG.md +++ b/src/Symfony/Component/Config/CHANGELOG.md @@ -5,6 +5,7 @@ CHANGELOG ----- * added numerical type handling for config definitions + * added convenience methods for optional configuration sections to ArrayNodeDefinition 2.1.0 ----- From b3345c9abf7c4d14bdaa5d2086220c1dfc736a47 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 6 Oct 2012 21:50:10 +0200 Subject: [PATCH 093/975] [Config] added some phpdocs --- .../Definition/Builder/ArrayNodeDefinition.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php index 219eec3abda61..f06c56188b159 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php @@ -209,6 +209,13 @@ public function canBeUnset($allow = true) return $this; } + /** + * Adds an "enabled" boolean to enable the current section. + * + * By default, the section is disabled. + * + * @return ArrayNodeDefinition + */ public function canBeEnabled() { $this @@ -223,6 +230,13 @@ public function canBeEnabled() return $this; } + /** + * Adds an "enabled" boolean to enable the current section. + * + * By default, the section is enabled. + * + * @return ArrayNodeDefinition + */ public function canBeDisabled() { $this From f187beed85887a2f653f98370c0889f807b4ddf1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 6 Oct 2012 22:09:27 +0200 Subject: [PATCH 094/975] fixed typo --- src/Symfony/Component/DomCrawler/Form.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php index ab7d655ae32e4..1898e6c8d1e4b 100644 --- a/src/Symfony/Component/DomCrawler/Form.php +++ b/src/Symfony/Component/DomCrawler/Form.php @@ -584,4 +584,3 @@ private function getSegments($name) throw new \InvalidArgumentException(sprintf('Malformed field path "%s"', $name)); } } ->>>>>>> 2.1 From f66f110024814fcd92b3cd3747076adb83a3a379 Mon Sep 17 00:00:00 2001 From: Tamas Szijarto Date: Sun, 7 Oct 2012 19:13:37 +0200 Subject: [PATCH 095/975] FIX [2.1][ClassLoader]UniversalClassLoader not working with AnnotationRegistry::registerLoader --- .../ClassLoader/Tests/UniversalClassLoaderTest.php | 8 ++++---- .../Component/ClassLoader/UniversalClassLoader.php | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php b/src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php index fd60fdf8e8d9a..308700b18b2ed 100644 --- a/src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php +++ b/src/Symfony/Component/ClassLoader/Tests/UniversalClassLoaderTest.php @@ -23,7 +23,7 @@ public function testLoadClass($className, $testClassName, $message) $loader = new UniversalClassLoader(); $loader->registerNamespace('Namespaced', __DIR__.DIRECTORY_SEPARATOR.'Fixtures'); $loader->registerPrefix('Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures'); - $loader->loadClass($testClassName); + $this->assertTrue($loader->loadClass($testClassName)); $this->assertTrue(class_exists($className), $message); } @@ -92,7 +92,7 @@ public function testLoadClassFromFallback($className, $testClassName, $message) $loader->registerPrefix('Pearlike_', __DIR__.DIRECTORY_SEPARATOR.'Fixtures'); $loader->registerNamespaceFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback')); $loader->registerPrefixFallbacks(array(__DIR__.DIRECTORY_SEPARATOR.'Fixtures/fallback')); - $loader->loadClass($testClassName); + $this->assertTrue($loader->loadClass($testClassName)); $this->assertTrue(class_exists($className), $message); } @@ -128,7 +128,7 @@ public function testLoadClassNamespaceCollision($namespaces, $className, $messag $loader = new UniversalClassLoader(); $loader->registerNamespaces($namespaces); - $loader->loadClass($className); + $this->assertTrue($loader->loadClass($className)); $this->assertTrue(class_exists($className), $message); } @@ -178,7 +178,7 @@ public function testLoadClassPrefixCollision($prefixes, $className, $message) $loader = new UniversalClassLoader(); $loader->registerPrefixes($prefixes); - $loader->loadClass($className); + $this->assertTrue($loader->loadClass($className)); $this->assertTrue(class_exists($className), $message); } diff --git a/src/Symfony/Component/ClassLoader/UniversalClassLoader.php b/src/Symfony/Component/ClassLoader/UniversalClassLoader.php index b6128ad6793a6..e3170ccee0884 100644 --- a/src/Symfony/Component/ClassLoader/UniversalClassLoader.php +++ b/src/Symfony/Component/ClassLoader/UniversalClassLoader.php @@ -242,11 +242,15 @@ public function register($prepend = false) * Loads the given class or interface. * * @param string $class The name of the class + * + * @return Boolean|null True, if loaded */ public function loadClass($class) { if ($file = $this->findFile($class)) { require $file; + + return true; } } From 45349602e3bc0d92b81cd1ebf2322b6457404a7d Mon Sep 17 00:00:00 2001 From: Sebastiaan Stok Date: Tue, 26 Jun 2012 12:12:42 +0200 Subject: [PATCH 096/975] [Security] Added Pbkdf2PasswordEncoder [Security] changed default iterations of Pbkdf2PasswordEncoder to 1000 instead of 5000 [Security] Improved description of PBKDF2 encoder [SecurityBundle] added PBKDF2 PasswordEncoder updated CHANGELOG.md [Security] Use the build-in hash_pbkdf2() when available [SecurityBundle] added information about hash_algorithm for configuration [Security] always check algorithm and fixed CS --- .../Bundle/SecurityBundle/CHANGELOG.md | 5 + .../DependencyInjection/MainConfiguration.php | 2 + .../DependencyInjection/SecurityExtension.php | 15 +++ .../Resources/config/security.xml | 1 + .../Fixtures/php/container1.php | 7 ++ .../Fixtures/xml/container1.xml | 2 + .../Fixtures/yml/container1.yml | 6 ++ .../SecurityExtensionTest.php | 4 + src/Symfony/Component/Security/CHANGELOG.md | 5 + .../Core/Encoder/Pbkdf2PasswordEncoder.php | 97 +++++++++++++++++++ .../Encoder/Pbkdf2PasswordEncoderTest.php | 45 +++++++++ 11 files changed, 189 insertions(+) create mode 100644 src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php create mode 100644 src/Symfony/Component/Security/Tests/Core/Encoder/Pbkdf2PasswordEncoderTest.php diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md index 39926aeb2b9ff..b726f27f95c62 100644 --- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2.2.0 +----- + +* Added PBKDF2 Password encoder + 2.1.0 ----- diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php index c7b631e07fdb7..267e604828460 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php @@ -378,6 +378,8 @@ private function addEncodersSection(ArrayNodeDefinition $rootNode) ->beforeNormalization()->ifString()->then(function($v) { return array('algorithm' => $v); })->end() ->children() ->scalarNode('algorithm')->cannotBeEmpty()->end() + ->scalarNode('hash_algorithm')->info('Name of hashing algorithm for PBKDF2 (i.e. sha256, sha512, etc..) See hash_algos() for a list of supported algorithms.')->defaultValue('sha512')->end() + ->scalarNode('key_length')->defaultValue(40)->end() ->booleanNode('ignore_case')->defaultFalse()->end() ->booleanNode('encode_as_base64')->defaultTrue()->end() ->scalarNode('iterations')->defaultValue(5000)->end() diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php index de1001aae6220..fd8fe2355a3f6 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php @@ -449,6 +449,21 @@ private function createEncoder($config, ContainerBuilder $container) ); } + // pbkdf2 encoder + if ('pbkdf2' === $config['algorithm']) { + $arguments = array( + $config['hash_algorithm'], + $config['encode_as_base64'], + $config['iterations'], + $config['key_length'], + ); + + return array( + 'class' => new Parameter('security.encoder.pbkdf2.class'), + 'arguments' => $arguments, + ); + } + // message digest encoder $arguments = array( $config['algorithm'], diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml index 473342513cc54..6f9257a42a469 100644 --- a/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml +++ b/src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml @@ -12,6 +12,7 @@ Symfony\Component\Security\Core\Encoder\EncoderFactory Symfony\Component\Security\Core\Encoder\MessageDigestPasswordEncoder Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder + Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder Symfony\Component\Security\Core\User\InMemoryUserProvider Symfony\Component\Security\Core\User\User diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php index 8652333b85171..826b621bb4e08 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/php/container1.php @@ -15,6 +15,13 @@ 'JMS\FooBundle\Entity\User4' => array( 'id' => 'security.encoder.foo', ), + 'JMS\FooBundle\Entity\User5' => array( + 'algorithm' => 'pbkdf2', + 'hash_algorithm' => 'sha1', + 'encode_as_base64' => false, + 'iterations' => 5, + 'key_length' => 30, + ), ), 'providers' => array( 'default' => array( diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml index 20c376075a178..7180503f3ce41 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/xml/container1.xml @@ -16,6 +16,8 @@ + + diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml index ade174fe6f47c..bf05e049f7c84 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Fixtures/yml/container1.yml @@ -10,6 +10,12 @@ security: algorithm: md5 JMS\FooBundle\Entity\User4: id: security.encoder.foo + JMS\FooBundle\Entity\User5: + algorithm: pbkdf2 + hash_algorithm: sha1 + encode_as_base64: false + iterations: 5 + key_length: 30 providers: default: diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php index 60e177882253f..1d486d60204a0 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php @@ -145,6 +145,10 @@ public function testEncoders() 'arguments' => array('md5', true, 5000), ), 'JMS\FooBundle\Entity\User4' => new Reference('security.encoder.foo'), + 'JMS\FooBundle\Entity\User5' => array( + 'class' => new Parameter('security.encoder.pbkdf2.class'), + 'arguments' => array('sha1', false, 5, 30), + ), )), $container->getDefinition('security.encoder_factory.generic')->getArguments()); } diff --git a/src/Symfony/Component/Security/CHANGELOG.md b/src/Symfony/Component/Security/CHANGELOG.md index c570ac31cd89a..b1c8192253e60 100644 --- a/src/Symfony/Component/Security/CHANGELOG.md +++ b/src/Symfony/Component/Security/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +2.2.0 +----- + +* Added PBKDF2 Password encoder + 2.1.0 ----- diff --git a/src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php b/src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php new file mode 100644 index 0000000000000..656545f2c859c --- /dev/null +++ b/src/Symfony/Component/Security/Core/Encoder/Pbkdf2PasswordEncoder.php @@ -0,0 +1,97 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Security\Core\Encoder; + +/** + * Pbkdf2PasswordEncoder uses the PBKDF2 (Password-Based Key Derivation Function 2). + * + * Providing a high level of Cryptographic security, + * PBKDF2 is recommended by the National Institute of Standards and Technology (NIST). + * + * But also warrants a warning, using PBKDF2 (with a high number of iterations) slows down the process. + * PBKDF2 should be used with caution and care. + * + * @author Sebastiaan Stok + * @author Andrew Johnson + * @author Fabien Potencier + */ +class Pbkdf2PasswordEncoder extends BasePasswordEncoder +{ + private $algorithm; + private $encodeHashAsBase64; + private $iterations; + private $length; + + /** + * Constructor. + * + * @param string $algorithm The digest algorithm to use + * @param Boolean $encodeHashAsBase64 Whether to base64 encode the password hash + * @param integer $iterations The number of iterations to use to stretch the password hash + * @param integer $length Length of derived key to create + */ + public function __construct($algorithm = 'sha512', $encodeHashAsBase64 = true, $iterations = 1000, $length = 40) + { + $this->algorithm = $algorithm; + $this->encodeHashAsBase64 = $encodeHashAsBase64; + $this->iterations = $iterations; + $this->length = $length; + } + + /** + * {@inheritdoc} + * + * @throws \LogicException when the algorithm is not supported + */ + public function encodePassword($raw, $salt) + { + if (!in_array($this->algorithm, hash_algos(), true)) { + throw new \LogicException(sprintf('The algorithm "%s" is not supported.', $this->algorithm)); + } + + if (function_exists('hash_pbkdf2')) { + $digest = hash_pbkdf2($this->algorithm, $raw, $salt, $this->iterations, $this->length, true); + } else { + $digest = $this->hashPbkdf2($this->algorithm, $raw, $salt, $this->iterations, $this->length); + } + + return $this->encodeHashAsBase64 ? base64_encode($digest) : bin2hex($digest); + } + + /** + * {@inheritdoc} + */ + public function isPasswordValid($encoded, $raw, $salt) + { + return $this->comparePasswords($encoded, $this->encodePassword($raw, $salt)); + } + + private function hashPbkdf2($algorithm, $password, $salt, $iterations, $length = 0) + { + // Number of blocks needed to create the derived key + $blocks = ceil($length / strlen(hash($algorithm, null, true))); + $digest = ''; + + for ($i = 1; $i <= $blocks; $i++) { + $ib = $block = hash_hmac($algorithm, $salt . pack('N', $i), $password, true); + + // Iterations + for ($j = 1; $j < $iterations; $j++) { + $ib ^= ($block = hash_hmac($algorithm, $block, $password, true)); + } + + $digest .= $ib; + } + + return substr($digest, 0, $this->length); + } +} diff --git a/src/Symfony/Component/Security/Tests/Core/Encoder/Pbkdf2PasswordEncoderTest.php b/src/Symfony/Component/Security/Tests/Core/Encoder/Pbkdf2PasswordEncoderTest.php new file mode 100644 index 0000000000000..2c985439f23b2 --- /dev/null +++ b/src/Symfony/Component/Security/Tests/Core/Encoder/Pbkdf2PasswordEncoderTest.php @@ -0,0 +1,45 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\Security\Tests\Core\Encoder; + +use Symfony\Component\Security\Core\Encoder\Pbkdf2PasswordEncoder; + +class Pbkdf2PasswordEncoderTest extends \PHPUnit_Framework_TestCase +{ + public function testIsPasswordValid() + { + $encoder = new Pbkdf2PasswordEncoder('sha256', false, 1, 40); + + $this->assertTrue($encoder->isPasswordValid('c1232f10f62715fda06ae7c0a2037ca19b33cf103b727ba56d870c11f290a2ab106974c75607c8a3', 'password', '')); + } + + public function testEncodePassword() + { + $encoder = new Pbkdf2PasswordEncoder('sha256', false, 1, 40); + $this->assertSame('c1232f10f62715fda06ae7c0a2037ca19b33cf103b727ba56d870c11f290a2ab106974c75607c8a3', $encoder->encodePassword('password', '')); + + $encoder = new Pbkdf2PasswordEncoder('sha256', true, 1, 40); + $this->assertSame('wSMvEPYnFf2gaufAogN8oZszzxA7cnulbYcMEfKQoqsQaXTHVgfIow==', $encoder->encodePassword('password', '')); + + $encoder = new Pbkdf2PasswordEncoder('sha256', false, 2, 40); + $this->assertSame('8bc2f9167a81cdcfad1235cd9047f1136271c1f978fcfcb35e22dbeafa4634f6fd2214218ed63ebb', $encoder->encodePassword('password', '')); + } + + /** + * @expectedException LogicException + */ + public function testEncodePasswordAlgorithmDoesNotExist() + { + $encoder = new Pbkdf2PasswordEncoder('foobar'); + $encoder->encodePassword('password', ''); + } +} From bf9d2be77d910112964ddd84c74463d24f8d0bd1 Mon Sep 17 00:00:00 2001 From: Arnaud Kleinpeter Date: Mon, 8 Oct 2012 17:17:46 +0200 Subject: [PATCH 097/975] [Console] Fixes in ProgressHelper --- .../Component/Console/Helper/DialogHelper.php | 4 +-- .../Console/Helper/FormatterHelper.php | 4 +-- .../Console/Helper/ProgressHelper.php | 27 +++++++------------ 3 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/Symfony/Component/Console/Helper/DialogHelper.php b/src/Symfony/Component/Console/Helper/DialogHelper.php index 03daf8c782786..e501de114f182 100644 --- a/src/Symfony/Component/Console/Helper/DialogHelper.php +++ b/src/Symfony/Component/Console/Helper/DialogHelper.php @@ -130,9 +130,7 @@ public function getInputStream() } /** - * Returns the helper's canonical name. - * - * @return string The helper name + * {@inheritDoc} */ public function getName() { diff --git a/src/Symfony/Component/Console/Helper/FormatterHelper.php b/src/Symfony/Component/Console/Helper/FormatterHelper.php index 34ae394578823..20c754ccf106c 100644 --- a/src/Symfony/Component/Console/Helper/FormatterHelper.php +++ b/src/Symfony/Component/Console/Helper/FormatterHelper.php @@ -91,9 +91,7 @@ private function strlen($string) } /** - * Returns the helper's canonical name. - * - * @return string The canonical name of the helper + * {@inheritDoc} */ public function getName() { diff --git a/src/Symfony/Component/Console/Helper/ProgressHelper.php b/src/Symfony/Component/Console/Helper/ProgressHelper.php index 8e57174e315d6..17e6412e3230b 100644 --- a/src/Symfony/Component/Console/Helper/ProgressHelper.php +++ b/src/Symfony/Component/Console/Helper/ProgressHelper.php @@ -296,6 +296,7 @@ private function initialize() * Generates the array map of format variables to values. * * @param Boolean $finish Forces the end result + * * @return array Array of format vars and values */ private function generate($finish = false) @@ -353,6 +354,7 @@ private function generate($finish = false) * Converts seconds into human-readable format. * * @param integer $secs Number of seconds + * * @return string Time in readable format */ private function humaneTime($secs) @@ -369,6 +371,7 @@ private function humaneTime($secs) } } } + return $text; } @@ -380,32 +383,22 @@ private function humaneTime($secs) * @param Boolean $newline Whether to add a newline or not * @param integer $size The size of line */ - private function overwrite(OutputInterface $output, $messages, $newline = true, $size = 80) + private function overwrite(OutputInterface $output, $messages, $newline = false, $size = 80) { - for ($place = $size; $place > 0; $place--) { - $output->write("\x08", false); - } - - $output->write($messages, false); - - for ($place = ($size - strlen($messages)); $place > 0; $place--) { - $output->write(' ', false); - } + $output->write(str_repeat("\x08", $size)); + $output->write($messages); + $output->write(str_repeat(' ', $size - strlen($messages))); // clean up the end line - for ($place = ($size - strlen($messages)); $place > 0; $place--) { - $output->write("\x08", false); - } + $output->write(str_repeat("\x08", $size - strlen($messages))); if ($newline) { - $output->write(''); + $output->writeln(''); } } /** - * Returns the canonical name of this helper. - * - * @return string The canonical name + * {@inheritDoc} */ public function getName() { From 61ab652a3b24151d9871395d5e4208e321ffc640 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 9 Oct 2012 14:26:19 +0200 Subject: [PATCH 098/975] [DomCrawler] fixed a bad merge --- src/Symfony/Component/DomCrawler/Form.php | 199 ------------------ .../DomCrawler/FormFieldRegistry.php | 6 +- 2 files changed, 3 insertions(+), 202 deletions(-) diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php index 1898e6c8d1e4b..846c114f977f2 100644 --- a/src/Symfony/Component/DomCrawler/Form.php +++ b/src/Symfony/Component/DomCrawler/Form.php @@ -385,202 +385,3 @@ private function initialize() } } } - -class FormFieldRegistry -{ - private $fields = array(); - - private $base; - - /** - * Adds a field to the registry. - * - * @param FormField $field The field - * - * @throws \InvalidArgumentException when the name is malformed - */ - public function add(FormField $field) - { - $segments = $this->getSegments($field->getName()); - - $target =& $this->fields; - while ($segments) { - if (!is_array($target)) { - $target = array(); - } - $path = array_shift($segments); - if ('' === $path) { - $target =& $target[]; - } else { - $target =& $target[$path]; - } - } - $target = $field; - } - - /** - * Removes a field and its children from the registry. - * - * @param string $name The fully qualified name of the base field - * - * @throws \InvalidArgumentException when the name is malformed - */ - public function remove($name) - { - $segments = $this->getSegments($name); - $target =& $this->fields; - while (count($segments) > 1) { - $path = array_shift($segments); - if (!array_key_exists($path, $target)) { - return; - } - $target =& $target[$path]; - } - unset($target[array_shift($segments)]); - } - - /** - * Returns the value of the field and its children. - * - * @param string $name The fully qualified name of the field - * - * @return mixed The value of the field - * - * @throws \InvalidArgumentException when the name is malformed - * @throws \InvalidArgumentException if the field does not exist - */ - public function &get($name) - { - $segments = $this->getSegments($name); - $target =& $this->fields; - while ($segments) { - $path = array_shift($segments); - if (!array_key_exists($path, $target)) { - throw new \InvalidArgumentException(sprintf('Unreachable field "%s"', $path)); - } - $target =& $target[$path]; - } - - return $target; - } - - /** - * Tests whether the form has the given field. - * - * @param string $name The fully qualified name of the field - * - * @return Boolean Whether the form has the given field - */ - public function has($name) - { - try { - $this->get($name); - - return true; - } catch (\InvalidArgumentException $e) { - return false; - } - } - - /** - * Set the value of a field and its children. - * - * @param string $name The fully qualified name of the field - * @param mixed $value The value - * - * @throws \InvalidArgumentException when the name is malformed - * @throws \InvalidArgumentException if the field does not exist - */ - public function set($name, $value) - { - $target =& $this->get($name); - if (!is_array($value) || $target instanceof Field\ChoiceFormField) { - $target->setValue($value); - } else { - $fields = self::create($name, $value); - foreach ($fields->all() as $k => $v) { - $this->set($k, $v); - } - } - } - - /** - * Returns the list of field with their value. - * - * @return array The list of fields as array((string) Fully qualified name => (mixed) value) - */ - public function all() - { - return $this->walk($this->fields, $this->base); - } - - /** - * Creates an instance of the class. - * - * This function is made private because it allows overriding the $base and - * the $values properties without any type checking. - * - * @param string $base The fully qualified name of the base field - * @param array $values The values of the fields - * - * @return FormFieldRegistry - */ - private static function create($base, array $values) - { - $registry = new static(); - $registry->base = $base; - $registry->fields = $values; - - return $registry; - } - - /** - * Transforms a PHP array in a list of fully qualified name / value. - * - * @param array $array The PHP array - * @param string $base The name of the base field - * @param array $output The initial values - * - * @return array The list of fields as array((string) Fully qualified name => (mixed) value) - */ - private function walk(array $array, $base = '', array &$output = array()) - { - foreach ($array as $k => $v) { - $path = empty($base) ? $k : sprintf("%s[%s]", $base, $k); - if (is_array($v)) { - $this->walk($v, $path, $output); - } else { - $output[$path] = $v; - } - } - - return $output; - } - - /** - * Splits a field name into segments as a web browser would do. - * - * - * getSegments('base[foo][3][]') = array('base', 'foo, '3', ''); - * - * - * @param string $name The name of the field - * - * @return array The list of segments - * - * @throws \InvalidArgumentException when the name is malformed - */ - private function getSegments($name) - { - if (preg_match('/^(?P[^[]+)(?P(\[.*)|$)/', $name, $m)) { - $segments = array($m['base']); - while (preg_match('/^\[(?P.*?)\](?P.*)$/', $m['extra'], $m)) { - $segments[] = $m['segment']; - } - - return $segments; - } - - throw new \InvalidArgumentException(sprintf('Malformed field path "%s"', $name)); - } -} diff --git a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php index 43b45c6712a63..5144ac739cae0 100644 --- a/src/Symfony/Component/DomCrawler/FormFieldRegistry.php +++ b/src/Symfony/Component/DomCrawler/FormFieldRegistry.php @@ -124,13 +124,13 @@ public function has($name) public function set($name, $value) { $target =& $this->get($name); - if (is_array($value)) { + if (!is_array($value) || $target instanceof Field\ChoiceFormField) { + $target->setValue($value); + } else { $fields = self::create($name, $value); foreach ($fields->all() as $k => $v) { $this->set($k, $v); } - } else { - $target->setValue($value); } } From 74e2c5ef89d5652317b60b026a30685729d33aba Mon Sep 17 00:00:00 2001 From: Jonathan Ingram Date: Wed, 10 Oct 2012 11:48:27 +1200 Subject: [PATCH 099/975] Fix incorrect inheritdoc blocks Also add a docblock to stopwatch member variable. Remove docblock from private member --- .../Controller/TraceableControllerResolver.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/TraceableControllerResolver.php b/src/Symfony/Bundle/FrameworkBundle/Controller/TraceableControllerResolver.php index 4994beaaa43f8..8f9546cf01e2e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/TraceableControllerResolver.php +++ b/src/Symfony/Bundle/FrameworkBundle/Controller/TraceableControllerResolver.php @@ -42,7 +42,7 @@ public function __construct(ContainerInterface $container, ControllerNameParser } /** - * @{inheritdoc} + * {@inheritdoc} */ public function getController(Request $request) { @@ -56,7 +56,7 @@ public function getController(Request $request) } /** - * @{inheritdoc} + * {@inheritdoc} */ public function getArguments(Request $request, $controller) { From e65ff0bcc25eb1af51a3cde184856dc94470c4c4 Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Thu, 11 Oct 2012 08:28:46 +0200 Subject: [PATCH 100/975] [Form] Removed unused method ChoiceView::isSelected() --- .../Form/Extension/Core/View/ChoiceView.php | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/Symfony/Component/Form/Extension/Core/View/ChoiceView.php b/src/Symfony/Component/Form/Extension/Core/View/ChoiceView.php index 5b348eae2aa0c..97cdd214c28f8 100644 --- a/src/Symfony/Component/Form/Extension/Core/View/ChoiceView.php +++ b/src/Symfony/Component/Form/Extension/Core/View/ChoiceView.php @@ -52,20 +52,4 @@ public function __construct($data, $value, $label) $this->value = $value; $this->label = $label; } - - /** - * Returns whether this choice is selected for the given value. - * - * @param string|array $value The selected choice value. - * - * @return Boolean Whether the choice is selected. - */ - public function isSelected($value) - { - if (is_array($value)) { - return false !== array_search($this->value, $value, true); - } - - return $this->value === $value; - } } From e396edbdc88dd1c42915ac523bbec431e6950245 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 10 Oct 2012 16:55:03 +0200 Subject: [PATCH 101/975] [Console] Add DialogHelper::askHiddenResponse method --- .../Component/Console/Helper/DialogHelper.php | 179 ++++++++++++++++-- .../Component/Console/Helper/hiddeninput.exe | Bin 0 -> 9216 bytes .../Console/Tests/Helper/DialogHelperTest.php | 9 + 3 files changed, 175 insertions(+), 13 deletions(-) create mode 100644 src/Symfony/Component/Console/Helper/hiddeninput.exe diff --git a/src/Symfony/Component/Console/Helper/DialogHelper.php b/src/Symfony/Component/Console/Helper/DialogHelper.php index e501de114f182..9f8c3e078e8c2 100644 --- a/src/Symfony/Component/Console/Helper/DialogHelper.php +++ b/src/Symfony/Component/Console/Helper/DialogHelper.php @@ -21,6 +21,8 @@ class DialogHelper extends Helper { private $inputStream; + private static $shell; + private static $stty; /** * Asks a question to the user. @@ -71,6 +73,72 @@ public function askConfirmation(OutputInterface $output, $question, $default = t return !$answer || 'y' == strtolower($answer[0]); } + /** + * Ask a question to the user, the response is hidden + * + * @param OutputInterface $output An Output instance + * @param string|array $question The question + * @param Boolean $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not + * + * @return string The answer + * + * @throws \RuntimeException In case the fallback is disactivated and the response can not be hidden + */ + public function askHiddenResponse(OutputInterface $output, $question, $fallback = true) + { + if (defined('PHP_WINDOWS_VERSION_BUILD')) { + $exe = __DIR__ . '\\hiddeninput.exe'; + + // handle code running from a phar + if ('phar:' === substr(__FILE__, 0, 5)) { + $tmpExe = sys_get_temp_dir() . '/hiddeninput.exe'; + copy($exe, $tmpExe); + $exe = $tmpExe; + } + + $output->write($question); + $value = rtrim(shell_exec($exe)); + $output->writeln(''); + + if (isset($tmpExe)) { + unlink($tmpExe); + } + + return $value; + } elseif ($this->hasSttyAvailable()) { + + $output->write($question); + + $sttyMode = shell_exec('/usr/bin/env stty -g'); + + shell_exec('/usr/bin/env stty -echo'); + $value = fgets($this->inputStream ?: STDIN, 4096); + shell_exec(sprintf('/usr/bin/env stty %s', escapeshellarg($sttyMode))); + + if (false === $value) { + throw new \RuntimeException('Aborted'); + } + + $value = trim($value); + $output->writeln(''); + + return $value; + } elseif (false !== $shell = $this->getShell()) { + + $output->write($question); + $readCmd = $shell === 'csh' ? 'set mypassword = $<' : 'read mypassword'; + $command = sprintf("/usr/bin/env %s -c 'stty -echo; %s; stty echo; echo \$mypassword'", $shell, $readCmd); + $value = rtrim(shell_exec($command)); + $output->writeln(''); + + return $value; + } elseif ($fallback) { + return $this->ask($output, $question); + } + + throw new \RuntimeException('Unable to hide the response'); + } + /** * Asks for a value and validates the response. * @@ -80,7 +148,7 @@ public function askConfirmation(OutputInterface $output, $question, $default = t * * @param OutputInterface $output An Output instance * @param string|array $question The question to ask - * @param callback $validator A PHP callback + * @param callable $validator A PHP callback * @param integer $attempts Max number of times to ask before giving up (false by default, which means infinite) * @param string $default The default answer if none is given by the user * @@ -90,21 +158,39 @@ public function askConfirmation(OutputInterface $output, $question, $default = t */ public function askAndValidate(OutputInterface $output, $question, $validator, $attempts = false, $default = null) { - $error = null; - while (false === $attempts || $attempts--) { - if (null !== $error) { - $output->writeln($this->getHelperSet()->get('formatter')->formatBlock($error->getMessage(), 'error')); - } + $interviewer = function() use ($output, $question, $default) { + return $this->ask($output, $question, $default); + }; - $value = $this->ask($output, $question, $default); + return $this->validateAttempts($interviewer, $output, $validator, $attempts); + } - try { - return call_user_func($validator, $value); - } catch (\Exception $error) { - } - } + /** + * Asks for a value, hide and validates the response. + * + * The validator receives the data to validate. It must return the + * validated data when the data is valid and throw an exception + * otherwise. + * + * @param OutputInterface $output An Output instance + * @param string|array $question The question to ask + * @param callable $validator A PHP callback + * @param integer $attempts Max number of times to ask before giving up (false by default, which means infinite) + * @param Boolean $fallback In case the response can not be hidden, whether to fallback on non-hidden question or not + * + * @return string The response + * + * @throws \Exception When any of the validators return an error + * @throws \RuntimeException In case the fallback is disactivated and the response can not be hidden + * + */ + public function askHiddenResponseAndValidate(OutputInterface $output, $question, $validator, $attempts = false, $fallback = true) + { + $interviewer = function() use ($output, $question, $fallback) { + return $this->askHiddenResponse($output, $question, $fallback); + }; - throw $error; + return $this->validateAttempts($interviewer, $output, $validator, $attempts); } /** @@ -136,4 +222,71 @@ public function getName() { return 'dialog'; } + + /** + * Return a valid unix shell + * + * @return string|false The valid shell name, false in case no valid shell is found + */ + private function getShell() + { + if (null !== self::$shell) { + return self::$shell; + } + + self::$shell = false; + + if (file_exists('/usr/bin/env')) { + // handle other OSs with bash/zsh/ksh/csh if available to hide the answer + $test = "/usr/bin/env %s -c 'echo OK' 2> /dev/null"; + foreach (array('bash', 'zsh', 'ksh', 'csh') as $sh) { + if ('OK' === rtrim(shell_exec(sprintf($test, $sh)))) { + self::$shell = $sh; + break; + } + } + } + + return self::$shell; + } + + private function hasSttyAvailable() + { + if (null !== self::$stty) { + return self::$stty; + } + + exec('/usr/bin/env stty', $output, $exicode); + + return self::$stty = $exicode === 0; + } + + /** + * Validate an attempt + * + * @param callable $interviewer A callable that will ask for a question and return the result + * @param OutputInterface $output An Output instance + * @param callable $validator A PHP callback + * @param integer $attempts Max number of times to ask before giving up ; false will ask infinitely + * + * @return string The validated response + * + * @throws \Exception In case the max number of attempts has been reached and no valid response has been given + */ + private function validateAttempts($interviewer, OutputInterface $output, $validator, $attempts) + { + $error = null; + while (false === $attempts || $attempts--) { + if (null !== $error) { + $output->writeln($this->getHelperSet()->get('formatter')->formatBlock($error->getMessage(), 'error')); + } + + try { + return call_user_func($validator, $interviewer()); + } catch (\Exception $error) { + } + } + + throw $error; + } } diff --git a/src/Symfony/Component/Console/Helper/hiddeninput.exe b/src/Symfony/Component/Console/Helper/hiddeninput.exe new file mode 100644 index 0000000000000000000000000000000000000000..c8cf65e8d819e6e525121cf6b21f1c2429746038 GIT binary patch literal 9216 zcmeHNe{@sVeZR8hV88~S)=Hp|Mpn({rC^@)BwNOI{ERJXCYlx+k1K6PLHo z_e!z_fhOzeA3JTX&-Z@s{rFOgjEwBlqjr!)9f zjyHz`A+ni`!0Taby{Uj5Y>jQq(k5A+X})PLWAi|{IZbtc8n^^trM{GI=P_15U6d?l zJJ3PW8XjfHpR}6`k{&5@JcEeH_SqQoQbU62o2YS30W)p_t&Fjy*RXQCZt$gCf|ao| zx&3R}m6|-Lfi@pua=$26n(UlnWo$>K67*|+#(qL_An=?l0M02AhOSJDv3;~?1ORfw z76EdK#MpSHqACHLcnJLIYlCSiX4eS@Pr8rN)Xwz0dk7O*y^0_C(Yks2Kvg! z-d-fJ)F9@k?>)m(XqDKIe2OKfhCQde9fpO0ko24yn*4xzX7q+ze`Z*=aJgwV?D?73 zaJ8UkSk|NN>@-|mB*f`EIK7$ElgAB<7p&p`^Vuq$58#;?B^*Bz7&d$B#+AYUC z(^m|`7{lqx&b^5$;i`j|S!+u|lcaQplp_&Nb)!>r>vGh3wb!tW zLq6%bkSt8jO|(vWH>LiPV(Xkp%BiGhl1q!PXXNKVKE!>Y5cHc2%cJOJA{-&ZsSn`T z#8~TA#(HWH4m>uCd+kCMTFgMI*s*n3!iCOwEI`{vGcVhzDu!Lw%-Ea^JATtrF`q3`+#KvvYJ0vM~A}D#LOD zlw`4ncB0U*Jji=--Wz#>I&5?hy;MgYW2u91d8ob=7MWfY`u;7Xe-J{Qsb0=0p|SM2 zG|=~mERIj4?gi)Ew|{LIN#oAsh20k_khIYjJBBN6rrIJ=eQO=nE;rTnPSiaQS$1$# z+|JRh0!IbQIa*f1(TZ}QM;|WO0+jTy(e)ggN4>zqp2E>C>hGPLHjHBh--2%@{EZNE zbUk{<3MABX&20QwK{MxK8`1Vk>^%dO5i@VTfu>NG3$K4NC=hSPsj9UYy`rNO}sBnB9QdKdIk7G+2_amnWstdTYVg z7HgLJGC~XLZG`63GwH8PdO_+G(k6~?J8Wj5mQos#21kC4W#2)guQXI)!z^{@F)U)5 z*re+r(2dib3D4P~%Z6TL=$PIkpmm<_#isu%t=%DcIwNkJhMeJ|bpahHO%8h|y~Ccf zUg#xVk+dyu>Q1O7JZ~8KS>tqi0qK**X*y6yHM71`bT=kFZ=@E%oe2!Km1^2sa>v+onZ%x_>aOJF+N0{i~z|<(IzgT*{0PpQq}E zQpU35@bm;qI?t_znGI&5&4sZV>+%m}w$(4hSDvLk)l<{5XyMlnCl7C%AjM3XnWvVz z{NoFsX)JB)SoqABZxUa*Yq+^^(cbq4mL%^lO12c${z{pf+)|kTTI~nQywyYF6}6|8 zlsN9&{-vwTrTyu<5^90_AsIU-ID#ZG@6d%poU44<**%xVe?`uxf}_Mr$SLHLS|K_N zQnw>(Lr2U=%$-<2D~RSzbG)2W2u^KMDnFFE?GmmbQ)V)fty957F`4OvQ_25E68ITr z5?`suu`|v?r!y=gFOGj$%9IJ zuTP=&2GcnoZZ0qSe6YL-*-lg>Q#>?Ew`a=GDc4vI#<1sNdKn?n7iSj0Orl$-#FMFi zykr>X-Xvi>sVr;92+8*H!r|3L$#o~hXa0z>AmF=z z?|@FF;*S|S0yqsw0j>Z(3mX-HD!|{N-vYc9paC8Ld=|6?00!6(_%lERupO`&um*4k z0b~W>e*uhTe4;V;mq>(ox$9FB`wLt!*DKj~!aOh|fL&#Pg*b??tm%5~_6M#02wqeC zS~wO>TWGnSp^r<0&8f2V6W->w=C+p~daC5e5wNQM*(* z66^}b0(!q3)zq$mu&VnbR#nr3;h5DS*o7{y66=!#;Dy4$pd1ZH<6WEOi0oJ8SxRL* z*v-9@Z^2w%^S(w5dO{_9Duby%2RT~;ppxaE$l()x6&}>7Wcg=u_&>f`Vs8OJGTy{X z2HpG=ThJz<{%|4Qq-~ad0qcrc87n88DHpM(nypwXIkZn<{zIT$ul&BQ?{ApCAZtyr zs2YpNt@x(G*faTU*HCKnAk(G=Tl~>r1QK8LY~J8mFFGoN5iIkYSwlm4Lsj#g4dsE5 zU-4;*Kdh-zv!rT4N$O}Q&n)?v0-9Y)lRFz58^P-KtKonzrfQ1p@0V_10^0||cGRn9 zRG<-#_TEV2nn4{BOh{YVBR4e!V!D?0K%BAlQN!D%M#k1bHypiIHT)5tlj>p0Pp_;+ z!cqC-JIs@JRhB+#teGs$Cib_=(yjRo4OJg^YPg%58aJVsC(LQ?W6%pn!-#aMZwoPcopo^Rn6BE z3=c5&W5~pP(C(-2r;PnH-S0{F`runM0ERCf3rESX$+S(MKOXmKJL9zXF}9-lf^xUs z+bb)+P%L&gV@<4q{6w^xEJ>Y>TQFUeoz0o-yq)jUqww=?wjUO8Y{a5G;DJ0Jr!LL+ zWhgsLuzi&eDrGDn$2DJwpFfH-?SGWbr>qRb?v{P`_%)So)CQgzO^HQ%;y#tJ=knH4 z95jX;^bF#BiuTH^%-j}{9VrZD=R%Q%wselH^p>5 z7d>gWB-st&3Fj%Mt*|tR5iK3J=`xhs&G)I7E>`FO@o7L z@S$B!pYMuzz5DN@X!O4DPm5n@raPJn-Q#o*m*e^5lk$g?0esg%$;>g5QW-|;c=H2GM}bo2tW^D924wmOkrUbWxcQ# z#v6bP%Tdfe~jtCRzAL;-OahZ=#yvUixu2-9fD2j$*|YY`F?0wF-{a# ztr<&kZjZ+81}6ZESqtgW)8kP#s@VLTSUR{}6?U^R*x7RE3Rl&n=VnFFqg9Uqz1n@N9N|=9<4} zuJfy^+}|D9X&vm3MAdqmu0&UMd^=K>b1hLAm_E!$rZC2b;;T~Dl zI`Eo_yRY76uM})|6wk9->of(=9&4jLv5#p@OzS~Yl>@pG)^>6`R+KtL{<4ly4o9WiM!%p_pfROU354)e8PIeE z1_s?#;OX6waNvvb&UQRN(WLbR+}&b#jo&WY-LlwCX}Q*$jGuKYuOGoIoyR(>e}}ix z+t}Q^cEcC8Y{@h}>HmJ^gD!l@gzwHmiBKl26x_lZVZG2UY!`w;RJd122;US&geQdW z3Qq}R!gIo5;ka;0I4c-Jq5X6A6?VzK&c4y!ZXdAUYu{r}*!SBXw?Aor+J4-A(*COb zb^CwV-?3k`zi-cX*c`VzL`RLI(b4MgIrGN z%ojf`E*6)Gg1A9!7q^N##2zsss^V9~-Qt7d!{UDNZ^XY9pA^3@9ui*?e=7c5d`nD; z?}~R(p>y1Kw!>|X4ycYEAkcZa*n-R%y! zqi)Up756UpqwfE7=hfigw$k~G@25gaxF9UGTkV>C(7x1Rbx4jb#|}rxq0vQ!n-c#f J0sQ~1{4brj`U(I5 literal 0 HcmV?d00001 diff --git a/src/Symfony/Component/Console/Tests/Helper/DialogHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/DialogHelperTest.php index a486f620954be..95cea05bc06ff 100644 --- a/src/Symfony/Component/Console/Tests/Helper/DialogHelperTest.php +++ b/src/Symfony/Component/Console/Tests/Helper/DialogHelperTest.php @@ -31,6 +31,15 @@ public function testAsk() $this->assertEquals('What time is it?', stream_get_contents($output->getStream())); } + public function testAskHiddenResponse() + { + $dialog = new DialogHelper(); + + $dialog->setInputStream($this->getInputStream("8AM\n")); + + $this->assertEquals('8AM', $dialog->askHiddenResponse($this->getOutputStream(), 'What time is it?')); + } + public function testAskConfirmation() { $dialog = new DialogHelper(); From ac01d5d7524ffcb399af7dd2495748900640809c Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 11 Oct 2012 17:29:08 +0200 Subject: [PATCH 102/975] Fix tests and CS --- .../Component/Console/Helper/DialogHelper.php | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/Symfony/Component/Console/Helper/DialogHelper.php b/src/Symfony/Component/Console/Helper/DialogHelper.php index 9f8c3e078e8c2..90ea51b24cf8e 100644 --- a/src/Symfony/Component/Console/Helper/DialogHelper.php +++ b/src/Symfony/Component/Console/Helper/DialogHelper.php @@ -87,7 +87,7 @@ public function askConfirmation(OutputInterface $output, $question, $default = t public function askHiddenResponse(OutputInterface $output, $question, $fallback = true) { if (defined('PHP_WINDOWS_VERSION_BUILD')) { - $exe = __DIR__ . '\\hiddeninput.exe'; + $exe = __DIR__ . '/hiddeninput.exe'; // handle code running from a phar if ('phar:' === substr(__FILE__, 0, 5)) { @@ -105,7 +105,9 @@ public function askHiddenResponse(OutputInterface $output, $question, $fallback } return $value; - } elseif ($this->hasSttyAvailable()) { + } + + if ($this->hasSttyAvailable()) { $output->write($question); @@ -113,7 +115,7 @@ public function askHiddenResponse(OutputInterface $output, $question, $fallback shell_exec('/usr/bin/env stty -echo'); $value = fgets($this->inputStream ?: STDIN, 4096); - shell_exec(sprintf('/usr/bin/env stty %s', escapeshellarg($sttyMode))); + shell_exec(sprintf('/usr/bin/env stty %s', $sttyMode)); if (false === $value) { throw new \RuntimeException('Aborted'); @@ -123,7 +125,9 @@ public function askHiddenResponse(OutputInterface $output, $question, $fallback $output->writeln(''); return $value; - } elseif (false !== $shell = $this->getShell()) { + } + + if (false !== $shell = $this->getShell()) { $output->write($question); $readCmd = $shell === 'csh' ? 'set mypassword = $<' : 'read mypassword'; @@ -132,7 +136,9 @@ public function askHiddenResponse(OutputInterface $output, $question, $fallback $output->writeln(''); return $value; - } elseif ($fallback) { + } + + if ($fallback) { return $this->ask($output, $question); } @@ -158,8 +164,10 @@ public function askHiddenResponse(OutputInterface $output, $question, $fallback */ public function askAndValidate(OutputInterface $output, $question, $validator, $attempts = false, $default = null) { - $interviewer = function() use ($output, $question, $default) { - return $this->ask($output, $question, $default); + $that = $this; + + $interviewer = function() use ($output, $question, $default, $that) { + return $that->ask($output, $question, $default); }; return $this->validateAttempts($interviewer, $output, $validator, $attempts); @@ -186,8 +194,10 @@ public function askAndValidate(OutputInterface $output, $question, $validator, $ */ public function askHiddenResponseAndValidate(OutputInterface $output, $question, $validator, $attempts = false, $fallback = true) { - $interviewer = function() use ($output, $question, $fallback) { - return $this->askHiddenResponse($output, $question, $fallback); + $that = $this; + + $interviewer = function() use ($output, $question, $fallback, $that) { + return $that->askHiddenResponse($output, $question, $fallback); }; return $this->validateAttempts($interviewer, $output, $validator, $attempts); From 61be89ddda30fb23cc9fc0b91167649fd75a31a6 Mon Sep 17 00:00:00 2001 From: Pascal Borreli Date: Fri, 12 Oct 2012 23:09:38 +0000 Subject: [PATCH 103/975] [Console] [ProgressHelper] better percentage precision --- .../Component/Console/Helper/ProgressHelper.php | 2 +- .../Console/Tests/Helper/ProgressHelperTest.php | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/Console/Helper/ProgressHelper.php b/src/Symfony/Component/Console/Helper/ProgressHelper.php index 17e6412e3230b..ed0ccab140191 100644 --- a/src/Symfony/Component/Console/Helper/ProgressHelper.php +++ b/src/Symfony/Component/Console/Helper/ProgressHelper.php @@ -304,7 +304,7 @@ private function generate($finish = false) $vars = array(); $percent = 0; if ($this->max > 0) { - $percent = (double) round($this->current / $this->max, 1); + $percent = (double) round($this->current / $this->max, 2); } if (isset($this->formatVars['bar'])) { diff --git a/src/Symfony/Component/Console/Tests/Helper/ProgressHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/ProgressHelperTest.php index e855146888b4d..8f96e90e4e8e8 100644 --- a/src/Symfony/Component/Console/Tests/Helper/ProgressHelperTest.php +++ b/src/Symfony/Component/Console/Tests/Helper/ProgressHelperTest.php @@ -63,6 +63,18 @@ public function testCustomizations() $this->assertEquals($this->generateOutput(' 1/10 [_/ ] 10%'), stream_get_contents($output->getStream())); } + public function testPercent() + { + $progress = new ProgressHelper(); + $progress->start($output = $this->getOutputStream(), 50); + $progress->display(); + $progress->advance(); + $progress->advance(); + + rewind($output->getStream()); + $this->assertEquals($this->generateOutput(' 0/50 [>---------------------------] 0%').$this->generateOutput(' 1/50 [>---------------------------] 2%').$this->generateOutput(' 2/50 [=>--------------------------] 4%'), stream_get_contents($output->getStream())); + } + protected function getOutputStream() { return new StreamOutput(fopen('php://memory', 'r+', false)); From dbcd171dd3097f1f1d9d94c9112aaf8eb974a015 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 13 Oct 2012 10:45:35 +0200 Subject: [PATCH 104/975] [WebProfilerBundle] moved all static assets directly into the templates This has been done for several reasons: * for consistency with the way we already manage the WDT icons; * it makes the WebProfiler independant from the location of the assets (and from the asset() function) * this is the very first step to make the WebProfiler useable outside the full-stack framework (more commits soon) There is still one asset() call though, which will be removed later on. --- .../Resources/views/Collector/security.html.twig | 2 +- .../Resources/public/favicon.ico | Bin 1150 -> 0 bytes .../Resources/public/images/close.png | Bin 402 -> 0 bytes .../Resources/public/images/config.png | Bin 379 -> 0 bytes .../Resources/public/images/db.png | Bin 246 -> 0 bytes .../Resources/public/images/events.png | Bin 730 -> 0 bytes .../Resources/public/images/exception.png | Bin 921 -> 0 bytes .../Resources/public/images/import.png | Bin 988 -> 0 bytes .../Resources/public/images/logger.png | Bin 283 -> 0 bytes .../Resources/public/images/mail.png | Bin 568 -> 0 bytes .../Resources/public/images/memory.png | Bin 199 -> 0 bytes .../public/images/profiler/bg_submenu.gif | Bin 176 -> 0 bytes .../public/images/profiler/bg_submenu.png | Bin 114 -> 0 bytes .../public/images/profiler/border_l.png | Bin 249 -> 0 bytes .../public/images/profiler/border_r.png | Bin 253 -> 0 bytes .../Resources/public/images/profiler/btn_bg.png | Bin 87 -> 0 bytes .../Resources/public/images/profiler/config.png | Bin 379 -> 0 bytes .../Resources/public/images/profiler/db.png | Bin 358 -> 0 bytes .../Resources/public/images/profiler/events.png | Bin 1060 -> 0 bytes .../public/images/profiler/exception.png | Bin 1148 -> 0 bytes .../public/images/profiler/grey_magnifier.png | Bin 393 -> 0 bytes .../public/images/profiler/input_bg.gif | Bin 63 -> 0 bytes .../public/images/profiler/left-arrow.png | Bin 1001 -> 0 bytes .../Resources/public/images/profiler/logger.png | Bin 453 -> 0 bytes .../images/profiler/logo_symfony_profiler.gif | Bin 2589 -> 0 bytes .../images/profiler/logo_symfony_profiler.png | Bin 2222 -> 0 bytes .../Resources/public/images/profiler/mail.png | Bin 1093 -> 0 bytes .../Resources/public/images/profiler/request.png | Bin 1042 -> 0 bytes .../public/images/profiler/right-arrow.png | Bin 1001 -> 0 bytes .../Resources/public/images/profiler/routing.png | Bin 696 -> 0 bytes .../public/images/profiler/security.png | Bin 994 -> 0 bytes .../Resources/public/images/profiler/spinner.gif | Bin 1505 -> 0 bytes .../Resources/public/images/profiler/time.png | Bin 776 -> 0 bytes .../Resources/public/images/request.png | Bin 757 -> 0 bytes .../Resources/public/images/routing.png | Bin 337 -> 0 bytes .../Resources/public/images/search.png | Bin 785 -> 0 bytes .../Resources/public/images/security.png | Bin 808 -> 0 bytes .../Resources/public/images/spacer.gif | Bin 45 -> 0 bytes .../Resources/public/images/symfony.png | Bin 1332 -> 0 bytes .../Resources/public/images/time.png | Bin 482 -> 0 bytes .../Resources/views/Collector/config.html.twig | 2 +- .../Resources/views/Collector/events.html.twig | 2 +- .../views/Collector/exception.html.twig | 2 +- .../Resources/views/Collector/logger.html.twig | 2 +- .../Resources/views/Collector/request.html.twig | 2 +- .../Resources/views/Collector/router.html.twig | 2 +- .../Resources/views/Collector/time.html.twig | 2 +- .../Resources/views/Profiler/admin.html.twig | 2 +- .../Resources/views/Profiler/base.html.twig | 4 ++-- .../Resources/views/Profiler/header.html.twig | 4 ++-- .../Resources/views/Profiler/layout.html.twig | 6 +++--- .../Profiler/profiler_style.html.twig} | 14 ++++++++------ .../Resources/views/Profiler/search.html.twig | 2 +- 53 files changed, 25 insertions(+), 23 deletions(-) delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/favicon.ico delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/close.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/config.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/db.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/events.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/exception.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/import.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/logger.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/mail.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/memory.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/bg_submenu.gif delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/bg_submenu.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/border_l.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/border_r.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/btn_bg.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/config.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/db.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/events.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/exception.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/grey_magnifier.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/input_bg.gif delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/left-arrow.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/logger.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/logo_symfony_profiler.gif delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/logo_symfony_profiler.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/mail.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/request.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/right-arrow.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/routing.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/security.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/spinner.gif delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/time.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/request.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/routing.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/search.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/security.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/spacer.gif delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/symfony.png delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/time.png rename src/Symfony/Bundle/WebProfilerBundle/Resources/{public/css/profiler.css => views/Profiler/profiler_style.html.twig} (71%) diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig index d0838de768f10..730436b2d5264 100644 --- a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig +++ b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig @@ -34,7 +34,7 @@ {% block menu %} - + Security {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/favicon.ico b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/favicon.ico deleted file mode 100644 index 864803618e0888f8463c0b30038633c018f939cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmaizUr1AN6vuy3^oL%AsH~?RBQobI=ccaNk~J)QQD?41%~lUl4?1&O#PTUgotA-9 zsDZB9Dx!CTsTlUUw?V5x4YK5>5M*n+r|-FL<1!X8KKK0Y+4-K|Ip_DgLX_ZFS}O27 zD6VZ4Vy_V55P%DwO+Snf_;2^FO_X=lLt9ZPzz)z@c~ldI{Q@#slCUp96W9qfs%tQ*oXL6(4`+eocJ>~>XTi!Tx6`NE0#k>{2Oo} ztK9}W2EBZ;)|i=(L{i>6UU}sHFa>93DOU?()OGNh>)?K^U==8P)fsB(g!Z`H)Oe2K zAL8V3c}P=UQK;p237iK()-qO$m3q1_)5Uf>)l?g3abZDzzr3uhc^8WX1k|b(vZuwUYd`2nOcXxJ?f6`A^uQ+Js>k0*)1Z4Ms zn^LJ1IeVQ{e)veSS*BUf_2AsdWHfQT>0~mg)MIP0(fZmtg+pPwU~40@=~Q74tpCV* z?ho@%#bU9aI76NxIeHwFNF*?aMWwIcY>?`WCUqU3p`BrU7P-H#KQlGy-*EQ!{qC?| zBHyTwqR}XwX|T}E>o*E#8G_CNzUOjq9hiOEpwp*$E~o3w^mcAenG2uk(7mCIUZ>~% zB=me1mhaCn;Cq#;BX2o}t+|y3?+$Lc6{R^^&pjZF^ diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/close.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/close.png deleted file mode 100644 index 6a4de0354d85b9d30921cac498cd4b0d00ef3a11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 402 zcmeAS@N?(olHy`uVBq!ia0vp^{2@j7K zvs2ce=MWwB(R})q8=oF4u?C*GUKkR*RNDHvnl5X8=vfKD1K*zT0bRx5>FVdQ&MBb@ E0NzsAIRF3v diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/config.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/config.png deleted file mode 100644 index e0898afb5ed30c21ef05835249fb604be332619b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^qChOe!3-pK9%IP?QfUD`A+GLQ&_>0QAirP+ZXQ*24NZL`V>4?T2XCLC^s4IG zhMflv9zK5Ji|9{WhJi;!* z@ji2=PcELst@*DeOJd4loBa&4Jfc}#4ssre6_1usdc5ZS+}@P@kQ1Fn8iwq z@?OgHN<1<{)!%!Y%$eB_g5EcI*K+K;b~bUc{)W_yTdA4SKc#24t?ST=EzrGTqoC+D zK{nW|Vg9Oq&DkOT%Yx4ClkU!lU3^*KTIml)jr-y6fBc|zd2E~P{tP4LkX6rmxWPjF5aHzlW_ck&n}HX$jc~AVRgC<_pwnwF6G4^8u1rB9RF3%!Gb{YPEVGnM{5_5(|Yw5uTaQFHose z7%xv1i^W~6iS_mME%Drheu0&hm3@7#3zSMFj&n$2*ayEj7Zw(_km~$Z&Lij-z#EG8_Vx^t zST>to=bV|D*+B|sx7(lNsUBV*qF-QfaZ&X5_rF6@KA+ziA0NNRYe}$lI{m$;r{_Jd z5794BC=|r(?Cc(rGMUT^uh;A3wIpzy;dL&T`-8QOXLa-o;JAhtC&>?2fEdo5x7lp> z)#J9dwr5CDN54QxJ4<#N4Lk8!8`z>i$4d!BxQU@*8jH#f&0JljYi z5py^kcSc4=zVTYITCHnHq2LI^h7>-oz-j1!TabhzJe{1J{5?HAP1t-(NFfpH?CgBP zS#NZ7beG>u!57#kb&l7D1#l@Z_4f8gd_Lc!fq{WHLqkKGxTJg7;UrxE!SGve@eEhz zE2lKUX~wVszUj_FH^ku~yoS#}l2C?+hc|hqpy*F|ZXM`2P45A`cmrIaw@6YVk;od) z4a@^c^Gz3s#bOOS9?vS0>f8iz1pT`p8jUu%p9brJf05)R-x7!^>5*r*G+~%19 z{Q}`|xB>3}yGUYzK%mAm1NsHz|CqE2oU8(W0iU|2^=5jyzyJUM M07*qoM6N<$f|KG{cmMzZ diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/exception.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/exception.png deleted file mode 100644 index b02aac786ad78700bec10aa73d17c9fe2b4d67ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 921 zcmV;K17`e*P)lZKjl)u z|0&?yWd*aq0(`wJQjb-!7MOtX@o~r0)Rd^GsMtXG3}_Gsd4f6Cu$DdSRV`p*V&W?3 z1!8Du$Q>LU{1kqWCzxXmYuUqI)dI%G#$x48Vj#6+|o+iyc<@0&C?y&fqM61%$-M$A3*oNcax_F}NEW8~drI zre@aRa0qX(CMG84vve>Ya0X{_rq2Qf2M4bJLE75dwzIRdXK=!gi;IhYhJ}TFOioUo zYi(_Hc6D`qA@sS%9BbH@nwt8&zP^5)KH*HiZo$C7z#Aq%0HqTw_kAwzhV)v$JzYiWdVqggrey_rS~M=H@+E;ScEf4Li*lfgD0DxB;TT zP22`|cXzk&1Mb`jdanbWG)wEVfbj6}`N+t~g@}jpn?OjsD=#lUiy_99mX`K|mhnY2Ha70TPAb+m1N|N_V9R&ycDp!FU0t0ELKd(i zGqjB5Tt-I53VQFTc@ka&PxN~Ii|Xp?!-j?iah{^0qQ%V2%xM|Mat=MN=;-J-oWWWC z3ebdxhJMJ;&v)Uk+rkd4;#nZhV=|fEr>Cb+%P^L56z41`DA?x=&f-j;1wegBRaMn7 zEWd=dVDDE}R&Fy^z-``4OiY}^Q|}cmW3EfJHq1DJ<-6e&HrTIQfFZ-c4GI9`Bp{UF zTfmJ2xnnRGHfR}3xg@E_EXDf)zm9RZ&cLmhgcaUkjiN{W_W)ilN;F^|hznp&qo`Le vps=ve6A!^I5QIM0Jk=_$%m0in1$g8yv3?9zY$BFI00000NkvXXu0mjffpfD? diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/import.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/import.png deleted file mode 100644 index 5d724cbdd0330e0ac234748faa688468d47a0f1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 988 zcmV<210(#2P)$bMGPt()WN9*hBCmS0ZT3B0K3)j@t1QQbz-I&vJEhQyodw6*GKs3>yhFW@*HKdWt znW17${n zYt)FIUiMJ@sHmuT>-BmySzKHUBbSR2V})7>c@o$-CrL?3H*jJh@hvPYcv!b$4r)YC zFMB9{OifLN=I7@%nVp^Wm`$jWJZ3YcrKK+Mcs!m%WE<;N%s~yc;$sh0TwLtJZZsJm zA3sF4nN65S1W$rbe7(KBucGO!(bw1aQhe3b)hnv1s>+8G(4@1o^Oe$k<% z)YSAen$8+^b#>3h*V5ARP&GC-`p3q`G^wqvePK1A9ue&RnfTD?Q8b+;F5`{*L42*P ztz+DPdvtVE6CCRY>+^~FZ%{+6_?nxWCn9JZ%;vzWyrsXt|Eu^$Mn>+a!NI{hctdH@ z-QE3-BC`qg-=Lea=muJ!G4b=;-LM z;m2nWSqmj4CHv{=>AP$~IA+bPf#)5)xN3KPetr=1Fzcs*U&i;yc4ZCRk#^k8?~!#Z zK>Lv%pfC=^=z9#Vs%U|``6_q}^cg%cw93E+CP65Ib{BZTZ53-YG&I}a zHc(N>1A8Wq`q$u_>rb(PNf6@vp962lza@|PjJWt?a3Q7V-u^$a7^EJg@9f#LU;{Kr(Tt1(0s@wR46q?b^YiD=S2#O6 z{{R`_fK34qoCo6lAR34K99LIYyap72%!rOqjVej6(%^<@- z2B>`d_N}q2tLv_>ukTkRv!lS0swdLLTpmpZCd~U002ovPDHLkV1jKGbGrZl diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/mail.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/mail.png deleted file mode 100644 index 1713d40c060bf2ccee2ac2a09cffa42da910d3e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 568 zcmV-80>}M{P)`6+&*pk#3bBkd2 zBE^eTDg_f_T+JpRrcK{MkYwHbA85cP#x}Si5Hj$Wb$0eQvYk$c zb2^hhr_W=*LJ&|#{}4>h=1ka5(%sm&C;bcD zXN1oo0c0KFWJn%)fy@#<^Jjtugq<=Bt(ag$asPt8WB3`$ogOTTvV#-=0000)Eqs|6>4qdwaN8Z*MP< zn`-dB52%HwB*-tAfk8mQz``N2VEz8>8`D{{|Yz;OXk;vd$@?2>{|QPv-yt diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/bg_submenu.gif b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/bg_submenu.gif deleted file mode 100644 index fc77660ee663d1a415dcbf56540d290146865653..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmZ?wbhEHbWMr^rIKsg2_U+qOuU=ihe*M9N2Y2t@y?XWP#fum3-@kw3#*OFCpFeu^ z=+>=UckbMI^5n_GhYz1Vefs9jo0l(NK701;@#DvrFJHcQ@80d(w_m(?ap}^fn>TM> zyLRo$l`F4bzh-~|#h)x-rVfY%+3CQlt03UvHC0ri+_YIWM?gIG{F9I~O&QXu42FIQ Z(umr;+o5m?Xj*6#? zV+coda>eN*2foO6Nlv&S@ULFPj%D#C1(Qu#DW)8TBEgI&r^>p;|BtW-s%P+Y^>bP0 Hl+XkKuhJeq diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/border_l.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/border_l.png deleted file mode 100644 index df27713055121a905d1105f17c4e4c9ca48b9798..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 249 zcmVNK0>rvd3;C00000NkvXXu0mjfS~+5n diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/border_r.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/border_r.png deleted file mode 100644 index fdd6dc6699d7418a90f22f706045fb40beb49cad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 253 zcmVSk!+zrx!6>i2 ztY;=K!`pA2RRv{r!*zXL%pXT()lp(xgbN3a-0R9amHu`3X5BqX00000NkvXXu0mjf D?AT_F diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/btn_bg.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/btn_bg.png deleted file mode 100644 index 303c12952684a30aa8d0903d42c3cddf6dbfaa17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 87 zcmeAS@N?(olHy`uVBq!ia0vp^j6f{I!2%??LS)^6l$@uFV+hCf_3mj l3wbl4$&Bg~CCLQ&_>0QAirP+ZXQ*24NZL`V>4?T2XCLC^s4IG zhMflv9zK5Ji|9{WhJi;!* z@ji2=PcELst@*DeOJd4loBa&4Jfc}#4ssre6_1usdc5ZS+}@P@kQ1Fn8iwq z@?OgHN<1<{)!%!Y%$eB_g5EcI*K+K;b~bUc{)W_yTdA4SKc#24t?ST=EzrGTqoC+D zK{nW|Vg9Oq&DkOT%Yx4ClkU!lU3^*KTIml)jr-y6fBcEqByClst+F}H;@= zc!2!U5;r(BL)r>gP;WTIEjAX>5_23kA;Slz`ibo6kZCOuLdo000B)NklHtqOmq3dkMR-j{EN}yH75GylFBwa@b z8+1$741%H6F5PHl8lrW|T!9T;GMO=hB}&-Tn8{?oCWFD_{b14}(4Cu``+hvXd(J)Y zc`xy3fK$GuuuN{#=738C4REzNa$8|p`4(_!KL|L%SJes5$=zgAqZ%g}4wX?wZO|x3fLV z>ogA4heyd9pM1 zhC#KkyZs>YkOc11hErZ%`$1v%pxWLbJA>R^9i)}$Q+o_k*~aEex|WK3H`GW24_tDq z#-K5fTPcV~MbxTKk5pYMHa1UXdklSQ0x3wNu1vf_-3rR$B3jcboEJa<;k>35(NyF` zD)Tz6V6-U&BB}5O@bMI$Mm%LjR_+&I>8jjMDK=1V93?`I5R!>bxSbxr5%akq0Lp_&|(Gh8K^vf zxUkSfn(Q7ew%lu;q@UR{BkAC*i6ElE%r2|H_eVc#eP}^cn8oR?&_c}&Dq+w~Gy8WP z@oOQRz#HN@TB!f)j_eOv>22B;Eqo!xy49g4-fvwzJin=b${pP|Dq%d63o)xh&#K30 zk>Q^U7bOq3-5>MS-lhHAaU`#XtaBBz^OQ{IO<(NoysVsPxz0w8m4mx7^kh{RD=D5D zcEEtjv+kT3HnQgeHmwN#ow{xD)a|=9OyUK+^p#}?wSQ|=3lT?*tUyCGpyYn>;kQoH ztysT!=IgC1R12~C0G%wDe>m{T&sj|8=FANCqessyQ9FW!|5fNlhGdpbT1PM2b$<#V zpBFC(Q2Oh4ADz0&R?CyKtXhaN+t_80zl$jG2X}5?`DMs-m;O(@b3?>rjBfCjHMw@= zQ8VnA4)ozLicpMW{_okXSgh9bArGumDTR3%Vt^<4UGWghpS3%Bod_1ODV6mo( zplTt;6Sa3NZWWPN|8jY^zQeGHU^n(5UmI4t!E_!(b5AI zo`64u2u0?nLloL{3u-(`6e0OlH{D_&ap+liucOXlJq2(l5CVZ~8-(?KM77~sY;z$X zz_yW7R4dlIYK4zxZ?gKb(5>Xa(Ul$=ZS}TJq zHA_7iZ>^Z1WBFvv?2;BeTRBQcEf+Vlq#@VvS>itomMrO}*HG>0$-J35bAmnI_Qk*@ zJx(&%nBg$epp!2gaLAlx9s1J?`|%Dw;acd4-2NO&WNsMBVrzF5Lk8n`m9=ha>_gHn z*pBeQ66XtBw5Qth`Aal*Pe_J6p69n7&!~yv=*)T^H8=^0tEGIwW=yYEMb)(Vs>H$9 zx~`v{S}ix{9ux?}QxGjSKVC4OfA>DSBC%)`Dz(mCQFcInY{WC~faA2qat_b)t`|H8 z32JQ}eZO6sa8H(7CthOwnEGXdX4kGM;7>7~EuOYM3 zuo(ho7n4P73k028lYi%D;C-YLU>E{dy$0b+(21U}7CV++tx3uYfluMH8RfC#o^d21 zaE;3v;tjWyn6CT(q0t_Q_=kc&(3eOd|NEfPnbv4+R%O3W?uVSkMcITI9@R0 z?q{2^Z*6FJ!wvUEKlQW>x_zQEobK|^?(wFp*t0ft3$!1PEuNpFc>u*Yp)+M}=KoWwn6UXo^@%zzA zBD?X(dj6z^*bXt0aS#y*fgk)4idUh80xx3|yx~XGNa81BKZ*FSB>V>=&rC#_tbtqr O0000YH z0D^Y*AYBhfdtYY{Z|hju|4aK!Hk+|Em85|8xE4{xAAL-`mID zH_!AxD^!6aQ2l(X{{j%F{b%_vkq2~9io<_Sr~((D`c5-Am*GEu3{XLy<9{BgKoZc3 z2-p8yFh8x7asq1Uvii>rRWRQQ250VyAfim;BEHvs2)+P7g{zfnbt3LIKNvq5tYvY!UK&bj(I3MnFyh>-ewR#sL}C=@;y ziA4QYtMxX%3TF!D8w`e%Ua$A!!otE9CNs&&$r+c)Waljw%RRb3up)SHa4_F&Huv~^ zz9Z?Zp;Rh0n@py2Wo2a{#^9l$p$#1!9ghQnz}`#}NGulH1_lN+xctr}t8=@$x~^vm zC2e+gR*9v$hRe07!2Fh$mPU`qbCAXT2kCxvxm+Q9&-2h^GXy-&6<-Jt2|>D>q$p&9Cod3L+KBpeR& zQ$P=;10~Jx_vgFa?gFxfso?BjFepng)&l4Q3Um{~T_(_Y!&1uP%s4m;R+pV(oDr}C z6#w=j)Iq# z_!+iviA3@vFE4K{-Y*U&K!0gzsh8nXyOIRnO*f#pxY&b04vYvDOg?;5C=_p4xYl1d zq5+|it~2_)BKDokKztgF<`IswMV9beh&SjuVQoV-H8oGk9I)c>;;N93)VZB zDHM-)rm3mPj7tYe-c%I`aiTrY;m*#^(|vt?61G6{c#THmSDj9GGiIqyXn{%1C4fpH z^~lJG78T|$oYjm|Ao00000NkvXXu0mjfq3p}1 diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/logger.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/logger.png deleted file mode 100644 index f5416bacc44d54d2f0c5100edcdb1bf3d35b60b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 453 zcmV;$0XqJPP)zzgM))Fw{O2+Q&aO4#CCUg{|K~5jwTiX!3-c?2({=JkZr<1 zgr@UAydMdlCqhpM5Jy5S`VC}T6Jt>U5IZ2@0wVN))goDBLyScZ$jKCDz^Fx|7L8g& zyhUUdL8BI76siY4e*AcaRu&-_s?IN7yr`vlssplF?%cT(G_)-mP2O~~$jQm+FVJ9n znp@P>)pY}CusMcBz$WZpkbtYJ>%TW|-dqI=9z<*Pkb*Zr^PK{QMf2y+KZDe&e0k=~ znN*;JBU;OcSZo2cglEQ#8Ko!|fm|?c+O(%gjr5NpAt7r50s>Z$g98HtSNi+=9|xNA z6J(x`kIxTqyADX`0CCl!Lx(Pum6d()^78sgt@r|3`e((86`-gv1X;uZ#GqDx91!;d v@p2$u0mRG5#2~%vfp{CJSq#MSKr9IWWrXsZtL8yN00000NkvXXu0mjf2Is<6 diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/logo_symfony_profiler.gif b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/logo_symfony_profiler.gif deleted file mode 100644 index 61d5f94d07c5b98abe28946293d7dbc7c6a33265..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2589 zcmb8q`#+P51Hkd;*@YR)GrKerwuUYvq!N-bm)t^Hbj4Ykj5Cfjmuj2UP==CQE_0bA zVv?gJjieQFsSp(_$w7x4_3CSEP>(S;rsWMYPCA_ zNSLF&)4O-?dU|@URo7%mvU#TxRVvlU$cU%A*UZdJL4ILSAd?dneXFT?X=&;G`}aE? zc6oXF%+JqvbaaSP&-L{5UM(uVckftr2CVNJfCT!(wXL@zL;CO?^{#+8pan6ijw<}@1t5+ z=;0&v1p)#`i+3?ol9hef;Pf72v4uVdZ(>oLU&tni*XPnu2jF}5C1`-4www0NM)&Kq z8y+`7je|(VF$@gmiUR;6jC2MLH!^N7o`OSbJuA6i}x<|`Q`^|NW4!MWH-ReZ4qruBVR@H1ysNW zyGftz4?iU4+p{79{ClX|D*iNZ-U860pJlVh@Gg5J_SpZVz5mfT9lcX?V6BL^cI)qX zF!(d7XRC=xP8NB!4fRq9@(tNo-zUfoF$bS>(Sdk+Mt$GNEiT~^Sb-{Lz1u+0UM%sD zG*gQf`G)|>;7R*5a8N-X+8p|H*$=MZ7HbnZjVqlR1JE_!bCxK(VtR}cr*ewq2~{}! z6mEpmmY!3Rwn#UW$+7HbHnJf*YxwBY5#qMX7iRDu`5{u3(%gW7n zNBv#FkT`jfZn`}F7Ix33#u!a&!fbf9X-pWSztd#UcEY85Mfxh6z0i^ zp^ga~2q{*L4Y~e_ZgudfX&Cc?UTo0WT}^b-9h!(}9%E^!{Diwfp--rGDzXoIGWdiU z$oAx20StF$bUIC=)>eYtRnG!jdir9Ez(8Z- zH}le91k}hhmd(3>)T^A*EcU>74ur?V&Ifs{Pyd8Nkg(Sv`{A8kXO__(5~0>jr3rQ; zCZ@Km;Q;J?)Id96<^ z1TSXn_iS45&lLt@MeZY-@?h!j7206c<&#XG(dxI3>37Q~gzdXUyy#|aSbRzUSH@j& zN@;Don_*A)J=a&ma;$cGebTH;-ACb!t7=5!k`H=!GBzn<>t(wKnlhOBzVTr6;HF?) zAv4_UeY!WwOm%cHblQ=E4`n3;_&KsnWo76Bvp4 zUbW5pG>*20A5=*53D3jqbi>Ka6YD$7QDoRP7T?~sQ;HF{Zdf4qVAfD8^t{ilWknxP z_g|ib*+Pv@I?iyy#R{VLN&YX}4Di)>1<7|W&}fLoK-p^2NKFAsw3voKty}Yfq-9vT z5~~|mRcSOg+3w&(M;P;;YL=e7w$ngQ*JDQ|%2CZ{q*0)g0r2muc0aZ{G%canF|^RJ z>7nHU;6z>3dikQ#LBYN(jze#xZ+pU&yMkyEJx!#PM2>b`_*ugbiCujcPC>MhOKAK>js9*HJdcxXVi>1Wr`Ij5dc32TbQuxx_)NeOUN)ha1U`R@r zynBa-tloq%3p~63#DAAlV>R-=&jZRqldH*S3TAZN(DS=;Ahdtfy$jCVd9B%u5QttPyh z;H{LL)3U4BFYgHTtIV%Y#&x7Jm4cJ4&PZJsP1b3q>p2_CBHQaU_^vLUA|49RIpG|n zLqs(>g<0mOO%1nBZXJM@g)OetykOJPiRRl0UpG{jF5+*rEw`ZV2*>5|nnd#XFDToP z%U;rLqB8&OYu#_e6cUdsb-wxWJO2rJZs~k?TbdGN)vwH$lJXvZsLF^6;Z|mQJ%-Jt zOdYwkx8#kmS@D^$WgRK8bHmaN`$@m~gimU$=7?S^A{KD%csI#)96wwJG_qY24bP5; z?)WGV#eE(aD_Q2Zy+Q>;59T-G1`Y(k5;WHx|E0h*VnV$)T~@?Y;A-P8paD zr1JM8HV1q`OOlHcv{Z+y(zS1`L)gefliNoAW9*S3F*;XSrWc%R&}@i$S+y~@{{{ur zQ{J91`&3mDaXT|4x;;qQFA(^`;T)Y9^UUO3mXgog41ivc6;E+xuKoNXhEvy^my1?LV)x%Y~8Cp2ioCer~#|&Qv_9d^zGLiZ6?O#mV}i hY0Xb?;{51}>rW<5p#>W&)F4!o_eOI;XaWEZ{{sdMXSDzT diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/logo_symfony_profiler.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/logo_symfony_profiler.png deleted file mode 100644 index 0d267cc0b5934dcfaa878bfca380ebf222d42bde..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2222 zcmV;f2vPTmP)2NKEYP?7_jogoB04%gmdaoV~rh#Kgq0v9j9Q+J1b0*x1=|Z*o^vSkKST zWMXBcq@~^6-P6<4zP`VUiHyw5%(}X|FfKCx|Nrmr@6CP%hyVZpFLY8)Q~&?}|NsC0 z|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0|Ns90TBSJm00009c5p#w z0003K0000!0CytY^#A||j7da6RCwC$o9BA!I1q;23$9=~p@a}pEc^a1Z#ARl62;_f zl4lp6?*|sPrDR@4Gb0&{S|fA2w(X3N%(mBCvmTQ^WD;#{(viK5#>~V=Abr{XSef`S z(JJ=G$i&RZr;5$7F>%*qP`NuQCSFEvQ0$F}$IlwKQC$dXd(TXUXU>_Dc!tKN!NhUznMp8!WI?@THkV99m<{iki93{YPT(eT4q*%R zzY4R7F_}CiqHS28F&TD~w4yq*_WS}~qIVQ;8U*GS7eqcRvwnIJbtplJQI?asw#w4@ zoJmZ2T3jyk=FF)I(vl{kOyfT&UP3~Co=LJR%Xj0YzKuyg>C96sMNV%F%O0zeTdLXZ zpG+zb@_OL^bckRSZeN@&ToC#ocA&VONf6XuR`@H6r%74L_AnEVv{gX#kj3jB z-&ZpcYd55&Y2A?h#XzEZ{nwamJIk7?Vfp-2ohoqxXVEKZDfpUoo@qwdh_KP`WtyF& z<XZu+>Mwfo#(R&pUEYjISewN0%$N{7?b+Dy=vgl060v{937{kNFr%D+*7SrU z_dMN<#5`Qq*HsCcAO>n^@=!8!54#d&EP;R&(ojr9|CJ>MG_aFRTG~|YG&2(+c5&Rm zv8}jOXMmyNo#@Ui_g<>`ORNM5LnHcbYrC&?9tIEDvQlw5E`_3AE_gO#s8L zKqfD%5}7O~U?^T$6soGrBsi+iqj_^HzbluB+3+@o?sT* zqC$&Zc0O*#lZ-;d(L6`?h+Te1h$yCbS->_B31~?_=_@ed0Kk0;c7;ND(J@)>00kfF zr7>Wa2~HMO%)es$L^SFKRTEvsnX)OfGeL&jdXKRWt~_4lwCa@zAoInI1C~F}p6E ztIZ?;!?_%cKytD~cxS}l$D+T{NFHDfFabA_4HP6C4U-r2E#t;pFjT*=sOs1qFC{5Ozy{MPac&Ql^ zwb5uK_42R+tF=rDsPYc9a6LSgEhc7r=k=7P8|fSAP&o0MOoHxmc`IiZ23$Rp*5g@3 z@*xwCmp&?^>`JEhnln*QP=G|wq`pFbRGUdn8d^LTNMXNdRIz)amD?}Zh!dJ3u&8}( z6N+1uB*rP(fB@wNNF@$bk4~3Z24ZeP@{Y?|qZUkrlBXTAvT7|8(2}hh%Lk*)BquG+ zFPBBT&VM92Wtt5Vq3o-B&)8optn0fWv9J>T{>rd$ccr)Y=o6h5yvWyR@bPE_!S?&4 zmc)w5kI4Ask=IdQ*bnc|i)G+9Y70~GH<&=~)M$^fWlnSoKXno_|JG;9F7CZ}zr-XW z8qEgW#2k2R1Bv+C%L0C?kW)ys`a8G8l4|V1&P=b;D01Ni@#iTt{n-uQ)(t wj7(5|-p7*r?udVzk1~VYmSHsy%z8xn2M#?biPf5D^8f$<07*qoM6N<$f@M`lDF6Tf diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/mail.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/mail.png deleted file mode 100644 index bdfa605520b0a3afadf5cad62027b7a235314637..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1093 zcmV-L1iJf)P)Y z8^>id(;U|sm(bK2r*tF}vvS6J`hOQEMsynIj#mge@Mq?nx%WH2`z`0YvxhNek?QK| zEYY_2`474dvA4Us`$T(tyL($(+k@uj=JKYdCV4|cgGwTiydD`DIZfB>7AOzY+uLg+ zlgXS~TU+l-rP7xGdJCWh{LYN2v$OLF?mZ+5=z;Tai#KGVkL2;Tjv z(P-|$rj4bb`v?djOK53nc?zKB#>U2vw27sHx4DId1sUuPVINx|p!+*IIzj<7N(RMH zeSJNfot;%6ci+=|W@hF#_O&t>)D};x77LOzIXOA4P$=H%=SrpW5%#q<7xXHgR4EoD z@>>HBN(|Tf`ubjB-(%*2UR0@6&*tXllt=*`8A743yu3W-<>kd39UVoLv$OM;u&}VZ zl!B%}Posd^F;qzQw(03P%G#rLhw}&ijZ$G?BnA@>9AH%P@uIG zGAAd8cLa)c!-Heo+D;3-ju(t^W1u8gS65b9S;=Z@YIJUHZbFKNRa8{0QNg;qyYp*8 zKrf+NNdE>(LOxNKA&+o=etzZ@4dp%EOXoA?yI{~WQ&Uq#ra)_JYguV&Da**nVB_QC zEG8yqJ4M3=2M1YZW+p2sDWR^!Eb*w#;^Jbm9<-;YXOp40xHx{@)6=KQ^QGh?~Axq?9tLf&{e(E^k_u&HRMt;WX2ZdgO>V>n`1adGjMMKd}& z$|55p4MR;feyG*zF&7sXL7-NU11eiXpeU>j#^dATS$=;0mR>{k@}8!)8xgwtbtE;O6I-Rb! ztgLJZ9@81S9=15-`T#x!fu37lUVaS7Z|MDckMf}l3JTis&gAXw{VOps@w*VvBaj1> z1xXCN#Y2iAN(~{Pd!eJyB`6wa-=_Q$5%@cGMmj)%lE}6lK^prj@=xeD6T-hD>{$G#00000 LNkvXXu0mjf+fV`B diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/request.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/request.png deleted file mode 100644 index 62cda7bf019f29472e30edf240ca69020e18fd93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1042 zcmV+t1nv8YP)>OZ=T5lrpPJAqabVSi3JG9p6aG6T4nCQ;;=s%{ z-h|KOFphYDDJ;c+rIW*=_un7)|04&@O+AodL`@D`1Zi2nYr$dT%WF_U z3K@k??yrQ80t9=LV#shhyX+&6;-=UqgwHkFMpP(mHrbZ zLHrke8(BjZ6;^^R3zn3m?<)+4FJko#sl#-iwBII7g8P|Nb%F=>8BUUY+X-gX3W7^5 ze?s@+SrN(zragyXczs>C=nqoQDizm9{gY5IiUwn2`W4T1bl-h;pAIAQtyZim}9zyTZlM~#OJ zDq}|rMDYD{h0sj*`BsP66B*P@+?A}So^5gPw8I9D)a#Vy($}M|TTjCa^C83z>_Q3_ zz;|=YsHU(g&6@7P3Pjb(>3GF)#gff)$%R1-wp-NO`&?3{R^ty}1QPQ*vNYqmODXEL z)eIMvH*aj`J7X1%RY-#Ae2@obA!Hj_K({2r`U}~zEO~lk(hGOxo2&OEYv07%=ljgV zxADsr9oJEUIz&_Dv_xcJTIk|Fh_%;wBp!*)riKIplor}6r0WMn+6%qlF;iI4L##zX zwv{x|L8O3<>4@3WMJYE+Fpq+TJg>~PGC_Uy%AiE#-fAw1j5~5_3#P%dHBn@?AC09l zmV$XBq5n*tGoO_fDzh#teO+#K=Gkh}ARZin(Rs3#%!}Do$&S5s3um#BouAS`;9w;t#r` z>Nc`b3^h^X35tdJ5Mw9K=Fs9l*@^GK#X^E|;@Aknas(ixXQ$N2b!-IEfnF(s5r{~l zvZ+3XkKl(zNdJPg`s%@sr@Kgu>Slyt2C0Ja177$H<+y@2Vn3k_pJLWKx^wvN4cc}b zLJ_L&|AX5R1WtC&mF^@zp-L?ISIm`=TY3o?4o$uT9H`Tzg` M07*qoM6N<$f*-f;hyVZp diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/right-arrow.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/right-arrow.png deleted file mode 100644 index bc6166272eb952cfeabe589d5a6e7ba69c10b1bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1001 zcmV z&dwe|r&?D#*aRH~oFVohgdWj)krH21|~ zaUfMNO{G#bI-SlNfj~e+M8I^VQaNa~T3dD^dWAyaQ@vh) z9)=rR;sSGBdQVT!1p?5QM8OarCt=rZC|;6*b4(`FHJr6BO-xKk!CoN>pP!$qOy@f;@HfwL_Z%Nd+C~?#u+wI;*;N}y-?}9m%Y*H{7q)kpv zmc*DbFclt!kVKXs_#=Sxk}Hh)`8SxsV9-c_L!cIbEyaF-n>Y?emGo{I z3+1WN9Dc>fNX&1M$PI(kquQK_%Sjv(n+Jy9>eK3?2dh)kFBk(uOP_q)@mk^ z0ci?_Vj7?yVCYFyxzMw>R##V#%Ve@IJJr-dBd{cuN*}<`9N&>(w}zZ==;-Ls*45Rm zr3wYVdb_&1P*Irzt>HETpo1XU=;-K0olch*4u?rYo0^)wwzs$6fg$qidr*K#>yrs8 z2Awb(jg4BZ_AuBCBEX`eqD|;DP37g~<8b-{#SLhkOqaPA6&uh|Q0>gj%rS$(uph*7 zI2=?=dlRmxs93M8taN}-O1?%e1EE;?zMb|K)m1j=0H`D?)aG)b;4`7WPUCPm8_^W` zjG7J5Cy*t+SftX>r-M*#=S1_J6@4P;_=&0>DnQWy@+AYN`t3x)lv~n^?Ak}$F98Ms X>*aOuJKrDw00000NkvXXu0mjfh)3Nk diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/routing.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/routing.png deleted file mode 100644 index 27df877ff2392618a12b2704e06effe19f52ebd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 696 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0VB`z%330WzxBpK%ShZ>uT+@;z zOWqPkdV;W*f?|M%<}SbZ*OlOAD`ad-pP|EdwP1h zy1Kf!xB!iEa&ig{4RvsE05U>CLV#>wH~^*U^f}G|11O>-$S;_Ik%^g=jh%y&o0m^i zOj<@>K}ktjRn5T2#LV2n($?O=!NtqRFCaE9K0CjlxTLbGp`odzr+@0=Wh+*%+pu%j z{)0!)oV|YQ&fSNPpTBtd>eIKMzkdJy`}dz<%dX?V&}Z~?aSW-rb@t-TphFGGsWJis OoWax8&t;ucLK6U4)pJ?^ diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/security.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/security.png deleted file mode 100644 index 8f3b4ea3bd1ecd8b45ed8f349a320d9df9a73611..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 994 zcmV<810DQ{P)(t7K+01!mnmtO#BG3 zviZ@5`8mxYtW`Eyj(M>{LE8eisk#0qUSqtNZ)-17;KiRk?|II7p5LDHob!$ybGzOD zg^ob~IndD1P+#OT=;^q)I4u@(AC_o8+Sgmq%M^UrqJ6yu4cQCUYPA+TPeNmiUb|eb zar&fZmL|#H2hb32LBl+Ps~`c{ps1FXmIqN$Q4WDXU@tB%9-5k(62l(B%nQhWKM0{v z=&q=!a5XhG+2wM%T_%$`5)u-2S)gIQfC?ag#(pk2Ir*dK;)#ig?_m$5!eIOaY{=5m z(#`et^_hu@2~BHj>uhapt)Zu6S7n5J_y)a+l)KoVNWX|qlMN~oiMDMvn=(B; z-GVgRbUIy+)oOjB*XsvVDwU?QvvW8tE$y?(WE$if^hRD@-YVzv{r&yV0JV~un)(&?JAgKlU8B(`F;`3DhK2?`zHA@gsrTR5*ocdXiTMeN zyY~&YSm@M#pjA~>I)y?pMQO!7z6Z(s`ufJ(+uNI$mzO0S9UY?vgF%7L!CNu;)z{ab z5sSsQ0jJxWBY>Qooaay^d`_@Ik=m`LrKQJ+vr^wJDJgliSN)lpnYzNl!da?(zS>hn zb#?W1EcoT1w+cW$)YQ~mf`7QDJvTSkh%7t;q=_99A0NMozWNSp@A3h9DU7_OS15`pSD=T}8!uk{$8M)2dE3~VttBv{`GzyI!pkb&+sZ_R5oEP#P^lx)y3EocyQA5wW#^&nIZ zU1U_w*v2@;9jjvY3-T5;fC&nQ!aQ^h3MA2(v2lw#HkjEj;OGyCBT$xp03qV7(1w$i Qi~s-t07*qoM6N<$f*l3ov;Y7A diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/spinner.gif b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/spinner.gif deleted file mode 100644 index 6954f42e8232f8f30c1ca480a20ff7ef9ff8af87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1505 zcmY+^YfMvT9LMpex6@O4fnK3X3)ET)R0Qb|wVHZ*Kyh?C3)yyXzQA|S+fTl~=f7oZOw_t` zAK(N2kO4B0oVqjBcbV_pPjgKtn;0yHR3@GObKc=}G&M9yCDQrV^E?4h5vm|V~M4S0kf0M<>Q7cpP5GXB`6<2OOsz3=c+Oe&NDD3x&mnieSa) z*yzIF3+6I&MOB3<$CR0sIs0N(xkjm4uj**)NKH=F>a+tx0~O^JHmeOq(208!vp>vE zKcB|**!0tBED7uF>(y@4PCcALW6-I`Q<)i=wmO?KQmNXc3iy|S| z06@TBWEuoyK!Lw;qz?elxVkYfI~lF1efTogf-gb?Z9hXltqp(TKP2*K=qLVoN@EUAXw=1u->wAe!h)XrYz6Y5+{90O;g73A3QbFKvZOYD3swX@*n6 zG)501$OYW~6zZe2eW-8-8ZDl9lENYGq0Az*=^sI9YjzFxI0c@{Al4f5Ukz4 z%B|xNF&0zVr;$LM5;l*L5gOfC&W4ke7I#L1*ISfuDeAi0mM0&v>mkkfywR)mK?_O! zMMey}D>6dgv8x_OO*)<87nZYU1v&TWS(ilOnC|I<$;X{PBZp8fCbAUK8M~>~DV`YZ zXo5h7?QPIVSp-~UN0~qlfuOS*T+|#v+YL zF<$&|iZ}`|zD6UITuJo?3O_E;2ZLZ;QC>WUn24Jc@)h<)5ymQ;heMb|;+(((BF1YQ4@ z=+2t>tYZdzc0}4o2l$dVvrAf5g}_O$EXiC?PYS_F^%^E%;-pqQkXJ|8d44z10rj0@ z?gV9a76=h0ky|;9i!+qei#Jko{Xk@8eF~o)QqZTFER;Mgf?FxUFM4w(ZvIromSlPBz&_Z2Z7ivd5{YvP;ZB52+ zB_iCk7h~{`hyRku;!RnXT*D-8;gP?-s}C?-(yzV!1{X-pfW-`4=44a`hsOIIzg7 zq1I3;8;wT*+-zj)2~H!9YS(#2Zi-T^?b3>a0OZoD^!6bip`JW!rVKPROGxh{e)<*d zQWkR+!anF|z6uy5jUb;ZDVC=4wZi-yEghDpwruARp}SS`{3kD4`_aoE^PalGm?r;U J??_>=;XgR+=cxby diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/time.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/time.png deleted file mode 100644 index 3250e11944f0099e5eb958c70bfb7981d76c7789..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 776 zcmV+j1NZ!iP)D{o!y|ga zR!k<--F!a3V@u*xDm93q%QBNT(ChUS+LO=~i?L{8UD75GD3I?a$5h=%oT!^vcnu#K z`FaJ&>fdyFK0Q5s0kMLP;-#gfJ!-Xjg@#y0o{`ZJW7<9-c6TRnFaFt063m{M;Pd%h zq}MItVXM{pk}I*(=}aMhSBtn@E+0`S6cw(-I-Tw_;tw>7d*bo<1PNkaOehozXX;z- zMzJUoiCkqMJ_>?>YS1~&(&_XBe&cTxOJcFu6a#TTk;@u%PP2uD1smB)8)DqN%s|{i zrzt>j`MJ8fs%;kc0<}t|`auF&$7nQufkO^@ep_5%)a`b^=SuAHc$VQf*)ER{MWfLe zSK?$c`2ddn?ZiWsO63yD**CVOsLyL?{~Q=-Cl-R!$mi#5O0lTwY4jLvkF;)?4Tix* zzu*6nEpaFmdW$wE!QiH45gf*l&!S+I{#5GqdOxAP>tw6scN7!)z$tKhZfF|cb z;d&{&1xC6b1R6-l(!Y_-W?!JP(9Um{%k_P6aWRW$r@%2F-s&k+1P%f_xR=RfUI&B0 zGLA*nW*N$96?0k2<#MkOdk0v+KCqqX@m2taNbe_s4@AJTVzD@1DwXDOodgfTEU<#( zr0(+Bc#{x-0n&>TKnBhdq+}lVlAwQ_yiu4Hhux{q<0kGTc?8n0000F zzp^XpXx0ewM`RzGrLnXbng-gI8g`pc@0{0BZsK3h;atu=&w0*)^Pa<5q0$>HH&Jk@ z+|(Pq3<9|2n+~5T5H!juu-Ygu5Tu>G91gB;nqNh8 zK0-Q7!Iw&h^$}jXBA~E}!ctmTg#d5F&?m(rC!2KKsdE^=*Elj3A|hvd2|~RQLmpqO zwz`wFjwu>9putT?n|j(EtG3dY5aNZXFtN3BW|$fzJ7S7XT6ZDUu1{xJMA3@CMZ^Rr z3)j7d93H~CYX9!LA5vf(pKSm`4wX_FA+#;fImIbdGvF&Z1 zj3FIoEk%efZD$eTERv38q+LLeGFSEhyg6dYAPXNEu}6XGduXt|qmld}E@gs6N(LcS zwo#A|3K`KPwz{XPw!P5V-3i$(@3-S1av^&Yt9J{UKQsT>|osn);>8P|0-Le#w2eagSoa>Xt2i*!luZCJ8axGv zFDBnC=Bok81!f8apH?=dzjS#iQ~E4&9axW)NquwQNJqcfL+m$?bTs$b8<2{~nVeUa zvL7t+>=P=nckUh$iv7sIA>^q?-Jp6DdE`G6aR@^YqHxO4N#XkVHA3&KLp(Oj-z5C8 z4uRMK4QMuSq=#YIo1S00000NkvXXu0mjf*^pR4 diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/routing.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/routing.png deleted file mode 100644 index 6c620bfb5a1a55b0847cd18107ca1b8659316a3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 337 zcmV-X0j~auP)ky^G7nE0Gk0I93LOw%McS2GaFgZ)z$R}P*X0F0S&kesH&=3#ZXjKv;$et z-QE2+P*V*d17^*dbss2~4Dv$Ogb5R#;xV8Ai2H$fKN4OC#3ewi3o^hEh%1430}$^4 z;x05VBp}=D<>mF}*s){LKyd|lAVN77Kn&8MM<@_IJw2bCKYv~VUo<-43Ijhszu&ue z@16-1R{~;2VhlhI1CSTz0dW`*ixTUC03bF1i2<=4lr0Lx%)}btKu%J&&dA7k3Bn*Y jIR>ah;~9k2@fiRBN=VE9ZwhAW00000NkvXXu0mjf4MlwL diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/search.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/search.png deleted file mode 100644 index 4405064ab227a3c905905360a05293e08a423eed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 785 zcmV+s1Md8ZP)jn9dCz${Np8GXBO?FR?Errz zu6Z>;5(@Ad-fApp9_zkd)&tZ*s#Sov)=Z5X z4R9wM4!;^59sRVsyX)@l?a6hx&N|k!4>_X(4^S74M$7B#>*tk9Mf_qt``C|j1HlG} zL?Y?6wYBqdxh#tB@(9s^CNLTu&5MV9?AMw=12hZ`4Sn3%*%2z0N|%UP2!pvw^I6on zUJv`R&pjO5575%m@&Xr_TPzkuJqP0h>x9_f*4CC`-g1Mot6u(-H*i73?9*LR|Kyb#XKRm^jp zbzTqpe{&xQ^p}udLwSBR!$J5i(QFsp$#MIPO zwWp^?hY0vUGC4UJfgD_bTu0X{;MV3RCMK#~U0t<9*gukukB?Imyo3Wd1JQV(`6jJ% zzy(qKB~?2+J2^yupaD{;lr0Bb5YO1yShc;q{RrDVvK{~zSr87mAfAztk!ove>!Ixc zygdiyfD7VDBoaTZ2f)+KO*r6!5T2kvTMsZeICxV};Y>Zg{nzYvfUEuhvoJY4k!qI+ P00000NkvXXu0mjf-zaj^ diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/security.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/security.png deleted file mode 100644 index fff6dd2eae93a991a5753a5b3d283413aabb42bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 808 zcmV+@1K0eCP)Od}MALrH}s*_7rBD+j(0Syl)RL70(A z%MsyR7fvxSbf#95$~uAGR65-zZR`7k^T3d^jUeeF2OqZQ`~3F%ob#OL*$zdc(S7AW z@Sg}$@cMfKsc~y2{JT zJ^lUtB$QE3^RW$bb8{n@-*h+}-$q78*6FiCp@_uvlaPR8fzae=V`HN>wvoYLP$54; z^DL{VsMz&-y$iLqwR~P)-nL4m+N!Uw|BP%gKR-V#^yBslIB>#jHuvrk+^3w?W@l%I z=jP_7b8>RF+S=Nt$MNdu=$IWI9)1e(N2}HPC6VCF;NYMoR?ySaV?%zH)iyUbZ{TW| zv4pEWpRW%OG-$C{#=E+@9FYF7+wHFt2~tC$&~=SQvrSoXadD96`J2d3v)bBJG#VGH ztE=D4%*^ycc|^9*@U{9p}Zm?_eo^ zHZ(LWjgF4aW@KcD3;ce+j^ntnm;hI{h1wf?vXEY{U$)t7UYvoIs;VlU&4~(d+h&aK zf)`*ihUegp%jGg9JH2rQ`+&FrxBUwTYn4zcmBD09)M|AEhb=(h1V@qzuqy({hQLE? z(RaxNPN#DjwGY4}{2r}}2_z*YC7TqmEr?7F00002e+feX diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/symfony.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/symfony.png deleted file mode 100644 index 6b66c424b9b1d78e05f6cef0f0c00a4594e73a9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1332 zcmeAS@N?(olHy`uVBq!ia0vp^Qa~)j!3-ol&c;7vU|>oK@Ck7>&@=i^I%sKb18VB+ z?wdYs23+@wnK=-~vZc$BHNq7@1pR#jfsE3UGGsMC_JaoxfTXXF ze@A;4L<;CI2&1f|eBy*jPo6wEefmslavDT%&g{7m#?GC)fQ%O}UO>24u3P~!oE=?q zvU69jUbANP+Qj%Iph$ODPjFzUqrJ0>lUrtb*0E#9fr8mtxj^#Go41oDPL7XDEG#Gj zI)2BFou^Kn28IbRD9TGKfbNM1iv$`4v~lg4b!X3>v$3*^jgG6SuA4h&o~^b0`STZ& z5|R(>KLE7!!uboK!C{LQE_QeIJb3U>cxa@Rg^j1XcX?UmlEq7b8ka6v2Gp`;%htn( zjs*AxR#(*m$wv<#0Udet=rN!RfkqYN7uD6)o10p?I=hDih3?qC186nSRY2`Pm-P2d z@b>hbH+OziWQ@I?BhW`c#{kVYF){-hWom35;2#tl6A$!SWkpq6YrC_PE0AGkY60|k zU_da?%-rle3o|P>7Z0Fymgd$#D}c7=<>Uk140Jru0oIl_9&Vo2mbM=5UO-EMsSD_4 ziIUuMV6r<^666=mz`)4N!pg?Q&BMzlAS5gzDJ3l}tDvZ)qNb*Vrpq+ zZDVKe?CRm=?c?Vk5D**{9T%67l#-g3nUh;kP*_}2QdU`6Ti@8!+}7RK-#=mE%vrPM z&YQPj`HIzR)^6CaVbkU zx^?Hy-Me=mK791(>C~P0{Q2`2 z5d8lA`_G@hfB&77bJ-5`%~nqr$B>F!sh3j2Ljon*9+sbz8g`S%z}xF4N-Dt?3Q@PP1 ze(|1;v+P-#b8kl3BZI}y!}iZt*x8rsdg#n{mbNlo=ZV$_ z=3mO%#P;ry+k6+PrQzMoBC6|@%oB}HRi9+F__m?!^A~=d*W37>uF^UFte&sueO%in zcehYsAqk_28+=~woj+l-r>ll}?W40Rn0AzjZ`!`#itY;yxAk+Xe%O?&Z!Z%rQ&_oj zhmEFsqj35>HV*6QVyip7^JmxXnb+2(e$+kkw!y9byI=Y^?(?UW7|n6r8U6E_ye@y- zzrPh#fnL_iTb$QMP8Te`CO+j(bx6>L!iO{D40mmIo_$YgUwqN4DJvgO`d$8Q$Klt! k*Ir2EuThT*=l{=Ob*=M|$G)3tz+}nb>FVdQ&MBb@0N#S`-v9sr diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/time.png b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/time.png deleted file mode 100644 index d7c2e7dbb9405c3fe63e3012bb9c165585e8fa96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 482 zcmV<80UiE{P)Kj@h+2dohY%qeI?BZ%p`bxp z8X6jcaEQW7f>cVb&l_F{o}OtCbnw8zeV^yJ_kIycl1Ab`1j^;IA{L9K-bs(S-wddu z9>6u}!r`#P?RKBoY&H>RmMGYN_INxwj^mawqwRELQIpAJOc0Ay=m$c_xm?aj9qN9` z*=%;kZnrIv>T4VWvH%D&I%`xsOX27^se6u05d(|`du5IKs)VhuGp zkx0DNYPAD6Rxn8e8ejygV7E{x++lH=xI5nx%d%23nQW9wrCZGKfB{p~m0#yEU;t*o zfjw|qtyV8_whQbFUF7Qrkq0^J~=H2KoBZ8W{+{{Fx4 Y37#u7c<*%S3;+NC07*qoM6N<$g4T`DZU6uP diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig index 2e1428f337232..6d8cabb5edaaf 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig @@ -80,7 +80,7 @@ {% block menu %} - Configuration + Configuration Config {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig index 19c1f397be906..f17856bc9be31 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/events.html.twig @@ -4,7 +4,7 @@ {% block menu %} - Events + Events Events {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig index a684d1d1175f1..ecb7d0a1a9095 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.html.twig @@ -7,7 +7,7 @@ {% block menu %} - Exception + Exception Exception {% if collector.hasexception %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig index 5d6ed4a0de6e9..a05eb5e90a413 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig @@ -18,7 +18,7 @@ {% block menu %} - Logger + Logger Logs {% if collector.counterrors %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig index fa43c50201d4c..0d0e0295a66e4 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig @@ -45,7 +45,7 @@ {% block menu %} - Request + Request Request {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/router.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/router.html.twig index a37ffe71e8068..2655f46d5c891 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/router.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/router.html.twig @@ -5,7 +5,7 @@ {% block menu %} - Routing + Routing Routing {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig index f4179792ffba4..7da6da407cd47 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig @@ -30,7 +30,7 @@ {% block menu %} - Timeline + Timeline Timeline {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.html.twig index 8989115b2b499..52dea037c954b 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.html.twig @@ -1,6 +1,6 @@