From 90c26a48cd8411f9b5036c1706ab555ce86a2d37 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 15 May 2012 17:04:12 +0200 Subject: [PATCH 01/12] [Console] fixed some CS --- .../Component/Console/Command/Command.php | 2 ++ .../Console/Formatter/OutputFormatter.php | 20 +++++++++---------- .../Formatter/OutputFormatterInterface.php | 8 ++++---- .../Formatter/OutputFormatterStyle.php | 16 +++++++-------- .../OutputFormatterStyleInterface.php | 10 +++++----- .../Component/Console/Helper/DialogHelper.php | 2 ++ .../Console/Helper/FormatterHelper.php | 2 ++ .../Component/Console/Input/StringInput.php | 2 ++ src/Symfony/Component/Console/Shell.php | 2 ++ .../Console/Tester/ApplicationTester.php | 2 ++ .../Console/Tester/CommandTester.php | 2 ++ 11 files changed, 41 insertions(+), 27 deletions(-) diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php index 6ee48c5e65..bec2313b3e 100644 --- a/src/Symfony/Component/Console/Command/Command.php +++ b/src/Symfony/Component/Console/Command/Command.php @@ -187,6 +187,8 @@ class Command * @param InputInterface $input An InputInterface instance * @param OutputInterface $output An OutputInterface instance * + * @return integer The command exit code + * * @see setCode() * @see execute() * diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php index 0904db9101..40001de279 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatter.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatter.php @@ -40,9 +40,9 @@ class OutputFormatter implements OutputFormatterInterface { $this->decorated = (Boolean) $decorated; - $this->setStyle('error', new OutputFormatterStyle('white', 'red')); - $this->setStyle('info', new OutputFormatterStyle('green')); - $this->setStyle('comment', new OutputFormatterStyle('yellow')); + $this->setStyle('error', new OutputFormatterStyle('white', 'red')); + $this->setStyle('info', new OutputFormatterStyle('green')); + $this->setStyle('comment', new OutputFormatterStyle('yellow')); $this->setStyle('question', new OutputFormatterStyle('black', 'cyan')); foreach ($styles as $name => $style) { @@ -90,9 +90,9 @@ class OutputFormatter implements OutputFormatterInterface /** * Checks if output formatter has style with specified name. * - * @param string $name + * @param string $name * - * @return Boolean + * @return Boolean * * @api */ @@ -104,11 +104,11 @@ class OutputFormatter implements OutputFormatterInterface /** * Gets style options from style with specified name. * - * @param string $name + * @param string $name * - * @return OutputFormatterStyleInterface + * @return OutputFormatterStyleInterface * - * @throws \InvalidArgumentException When style isn't defined + * @throws \InvalidArgumentException When style isn't defined * * @api */ @@ -164,9 +164,9 @@ class OutputFormatter implements OutputFormatterInterface /** * Tries to create new style instance from string. * - * @param string $string + * @param string $string * - * @return Symfony\Component\Console\Format\FormatterStyle|Boolean false if string is not format string + * @return Symfony\Component\Console\Format\FormatterStyle|Boolean false if string is not format string */ private function createStyleFromString($string) { diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php b/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php index 55359f50d0..ca9f9d0e3f 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php @@ -51,9 +51,9 @@ interface OutputFormatterInterface /** * Checks if output formatter has style with specified name. * - * @param string $name + * @param string $name * - * @return Boolean + * @return Boolean * * @api */ @@ -62,9 +62,9 @@ interface OutputFormatterInterface /** * Gets style options from style with specified name. * - * @param string $name + * @param string $name * - * @return OutputFormatterStyleInterface + * @return OutputFormatterStyleInterface * * @api */ diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php index 8eafce9c8f..ad02b94289 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php @@ -55,9 +55,9 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface /** * Initializes output formatter style. * - * @param string $foreground style foreground color name - * @param string $background style background color name - * @param array $options style options + * @param string $foreground The style foreground color name + * @param string $background The style background color name + * @param array $options The style options * * @api */ @@ -77,7 +77,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface /** * Sets style foreground color. * - * @param string $color color name + * @param string $color The color name * * @throws \InvalidArgumentException When the color name isn't defined * @@ -105,7 +105,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface /** * Sets style background color. * - * @param string $color color name + * @param string $color The color name * * @throws \InvalidArgumentException When the color name isn't defined * @@ -133,7 +133,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface /** * Sets some specific style option. * - * @param string $option option name + * @param string $option The option name * * @throws \InvalidArgumentException When the option name isn't defined * @@ -157,7 +157,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface /** * Unsets some specific style option. * - * @param string $option option name + * @param string $option The option name * * @throws \InvalidArgumentException When the option name isn't defined * @@ -181,7 +181,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface /** * Sets multiple style options at once. * - * @param array $options + * @param array $options */ public function setOptions(array $options) { diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php index 5c9e74f648..3d84d96ac6 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php @@ -23,7 +23,7 @@ interface OutputFormatterStyleInterface /** * Sets style foreground color. * - * @param string $color color name + * @param string $color The color name * * @api */ @@ -32,7 +32,7 @@ interface OutputFormatterStyleInterface /** * Sets style background color. * - * @param string $color color name + * @param string $color The color name * * @api */ @@ -41,7 +41,7 @@ interface OutputFormatterStyleInterface /** * Sets some specific style option. * - * @param string $option option name + * @param string $option The option name * * @api */ @@ -50,14 +50,14 @@ interface OutputFormatterStyleInterface /** * Unsets some specific style option. * - * @param string $option option name + * @param string $option Theoption name */ function unsetOption($option); /** * Sets multiple style options at once. * - * @param array $options + * @param array $options */ function setOptions(array $options); diff --git a/src/Symfony/Component/Console/Helper/DialogHelper.php b/src/Symfony/Component/Console/Helper/DialogHelper.php index cff6d5c14e..bcea45d731 100644 --- a/src/Symfony/Component/Console/Helper/DialogHelper.php +++ b/src/Symfony/Component/Console/Helper/DialogHelper.php @@ -121,6 +121,8 @@ class DialogHelper extends Helper /** * Returns the helper's canonical name. + * + * @return string The helper name */ public function getName() { diff --git a/src/Symfony/Component/Console/Helper/FormatterHelper.php b/src/Symfony/Component/Console/Helper/FormatterHelper.php index ea531296e8..dd9615bc62 100644 --- a/src/Symfony/Component/Console/Helper/FormatterHelper.php +++ b/src/Symfony/Component/Console/Helper/FormatterHelper.php @@ -24,6 +24,8 @@ class FormatterHelper extends Helper * @param string $section The section name * @param string $message The message * @param string $style The style to apply to the section + * + * @return string The format section */ public function formatSection($section, $message, $style = 'info') { diff --git a/src/Symfony/Component/Console/Input/StringInput.php b/src/Symfony/Component/Console/Input/StringInput.php index 7e0aba2004..93b1b83bb1 100644 --- a/src/Symfony/Component/Console/Input/StringInput.php +++ b/src/Symfony/Component/Console/Input/StringInput.php @@ -47,6 +47,8 @@ class StringInput extends ArgvInput * * @param string $input The input to tokenize * + * @return array An array of tokens + * * @throws \InvalidArgumentException When unable to parse input (should never happen) */ private function tokenize($input) diff --git a/src/Symfony/Component/Console/Shell.php b/src/Symfony/Component/Console/Shell.php index a2ec07a0ba..58a162ca7e 100644 --- a/src/Symfony/Component/Console/Shell.php +++ b/src/Symfony/Component/Console/Shell.php @@ -85,6 +85,8 @@ class Shell * * @param string $text The last segment of the entered text * @param integer $position The current position + * + * @return array An array of possibilities for the entered text */ private function autocompleter($text, $position) { diff --git a/src/Symfony/Component/Console/Tester/ApplicationTester.php b/src/Symfony/Component/Console/Tester/ApplicationTester.php index e3093cade2..0dca13e203 100644 --- a/src/Symfony/Component/Console/Tester/ApplicationTester.php +++ b/src/Symfony/Component/Console/Tester/ApplicationTester.php @@ -16,6 +16,8 @@ use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Output\StreamOutput; /** + * Eases the testing of console applications. + * * @author Fabien Potencier */ class ApplicationTester diff --git a/src/Symfony/Component/Console/Tester/CommandTester.php b/src/Symfony/Component/Console/Tester/CommandTester.php index 52be2781f6..c84057400e 100644 --- a/src/Symfony/Component/Console/Tester/CommandTester.php +++ b/src/Symfony/Component/Console/Tester/CommandTester.php @@ -16,6 +16,8 @@ use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Output\StreamOutput; /** + * Eases the testing of console commands. + * * @author Fabien Potencier */ class CommandTester From 8cd6cbcfc4dc5f90cb2e3df526f5302288328cc0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 16 May 2012 09:53:50 +0200 Subject: [PATCH 02/12] fixed some CS --- .../Definition/Builder/ArrayNodeDefinition.php | 2 ++ .../Config/Definition/Builder/ExprBuilder.php | 2 ++ .../Config/Definition/Builder/NodeBuilder.php | 2 ++ .../Config/Definition/Builder/NodeDefinition.php | 5 +++-- .../Component/Config/Loader/DelegatingLoader.php | 2 ++ .../Component/CssSelector/CssSelector.php | 16 ++++++++-------- .../CssSelector/Node/CombinedSelectorNode.php | 8 ++++++++ src/Symfony/Component/CssSelector/Tokenizer.php | 12 ++++++------ 8 files changed, 33 insertions(+), 16 deletions(-) diff --git a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php index f402a9627f..4d48b1044f 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php @@ -226,6 +226,8 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition * ->append($this->getBarNodeDefinition()) * ; * + * @param NodeDefinition $node A NodeDefinition instance + * * @return ArrayNodeDefinition This node */ public function append(NodeDefinition $node) diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php index d185089c7e..71cd39cf12 100644 --- a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php @@ -37,6 +37,8 @@ class ExprBuilder /** * Mark the expression as being always used. * + * @param \Closure $then + * * @return ExprBuilder */ public function always(\Closure $then = null) diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php index 518e264649..368a578c7d 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php +++ b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php @@ -144,6 +144,8 @@ class NodeBuilder implements NodeParentInterface * * @param string $type The name of the type * @param string $class The fully qualified name the node definition class + * + * @return NodeBuilder This node builder */ public function setNodeClass($type, $class) { diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php index 3cf39961f4..10f2be1c2e 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php @@ -53,6 +53,8 @@ abstract class NodeDefinition implements NodeParentInterface * Sets the parent node * * @param NodeParentInterface $parent The parent + * + * @return NodeDefinition */ public function setParent(NodeParentInterface $parent) { @@ -80,8 +82,7 @@ abstract class NodeDefinition implements NodeParentInterface */ public function getNode($forceRootNode = false) { - if ($forceRootNode) - { + if ($forceRootNode) { $this->parent = null; } diff --git a/src/Symfony/Component/Config/Loader/DelegatingLoader.php b/src/Symfony/Component/Config/Loader/DelegatingLoader.php index ca2506843b..39c0820bc8 100644 --- a/src/Symfony/Component/Config/Loader/DelegatingLoader.php +++ b/src/Symfony/Component/Config/Loader/DelegatingLoader.php @@ -39,6 +39,8 @@ class DelegatingLoader extends Loader * @param mixed $resource A resource * @param string $type The resource type * + * @return mixed + * * @throws FileLoaderLoadException if no loader is found. */ public function load($resource, $type = null) diff --git a/src/Symfony/Component/CssSelector/CssSelector.php b/src/Symfony/Component/CssSelector/CssSelector.php index d98aed147e..f5566be1f4 100644 --- a/src/Symfony/Component/CssSelector/CssSelector.php +++ b/src/Symfony/Component/CssSelector/CssSelector.php @@ -84,11 +84,11 @@ class CssSelector * Parses an expression and returns the Node object that represents * the parsed expression. * - * @throws \Exception When tokenizer throws it while parsing - * * @param string $string The expression to parse * * @return Node\NodeInterface + * + * @throws \Exception When tokenizer throws it while parsing */ public function parse($string) { @@ -136,11 +136,11 @@ class CssSelector * Parses a selector contained in $stream and returns the Node * object that represents it. * - * @throws ParseException When expected selector but got something else - * * @param TokenStream $stream The stream containing the selector. * * @return Node\NodeInterface + * + * @throws ParseException When expected selector but got something else */ private function parseSelector($stream) { @@ -177,11 +177,11 @@ class CssSelector * Parses a simple selector (the current token) from $stream and returns * the resulting Node object. * - * @throws ParseException When expected symbol but got something else - * * @param TokenStream $stream The stream containing the selector. * * @return Node\NodeInterface + * + * @throws ParseException When expected symbol but got something else */ private function parseSimpleSelector($stream) { @@ -284,13 +284,13 @@ class CssSelector * Parses an attribute from a selector contained in $stream and returns * the resulting AttribNode object. * - * @throws ParseException When encountered unexpected selector - * * @param Node\NodeInterface $selector The selector object whose attribute * is to be parsed. * @param TokenStream $stream The container token stream. * * @return Node\AttribNode + * + * @throws ParseException When encountered unexpected selector */ private function parseAttrib($selector, $stream) { diff --git a/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php b/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php index e9df87464f..d37e4f1073 100644 --- a/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php +++ b/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php @@ -79,6 +79,8 @@ class CombinedSelectorNode implements NodeInterface * * @param XPathExpr $xpath The XPath expression for this object * @param NodeInterface $sub The NodeInterface object to add + * + * @return XPathExpr An XPath instance */ protected function _xpath_descendant($xpath, $sub) { @@ -93,6 +95,8 @@ class CombinedSelectorNode implements NodeInterface * * @param XPathExpr $xpath The parent XPath expression * @param NodeInterface $sub The NodeInterface object to add + * + * @return XPathExpr An XPath instance */ protected function _xpath_child($xpath, $sub) { @@ -107,6 +111,8 @@ class CombinedSelectorNode implements NodeInterface * * @param XPathExpr $xpath The parent XPath expression * @param NodeInterface $sub The adjacent XPath expression + * + * @return XPathExpr An XPath instance */ protected function _xpath_direct_adjacent($xpath, $sub) { @@ -123,6 +129,8 @@ class CombinedSelectorNode implements NodeInterface * * @param XPathExpr $xpath The parent XPath expression * @param NodeInterface $sub The indirect adjacent NodeInterface object + * + * @return XPathExpr An XPath instance */ protected function _xpath_indirect_adjacent($xpath, $sub) { diff --git a/src/Symfony/Component/CssSelector/Tokenizer.php b/src/Symfony/Component/CssSelector/Tokenizer.php index a41aad62c5..f465180ef8 100644 --- a/src/Symfony/Component/CssSelector/Tokenizer.php +++ b/src/Symfony/Component/CssSelector/Tokenizer.php @@ -109,12 +109,12 @@ class Tokenizer * and returns an array holding the unquoted string contained by $s and * the new position from which tokenizing should take over. * - * @throws ParseException When expected closing is not found - * * @param string $s The selector string containing the quoted string. * @param integer $pos The starting position for the quoted string. * * @return array + * + * @throws ParseException When expected closing is not found */ private function tokenizeEscapedString($s, $pos) { @@ -146,11 +146,11 @@ class Tokenizer /** * Unescapes a string literal and returns the unescaped string. * - * @throws ParseException When invalid escape sequence is found - * * @param string $literal The string literal to unescape. * * @return string + * + * @throws ParseException When invalid escape sequence is found */ private function unescapeStringLiteral($literal) { @@ -172,12 +172,12 @@ class Tokenizer * contained in it and the new position from which tokenizing should take * over. * - * @throws ParseException When Unexpected symbol is found - * * @param string $s The selector string. * @param integer $pos The position in $s at which the symbol starts. * * @return array + * + * @throws ParseException When Unexpected symbol is found */ private function tokenizeSymbol($s, $pos) { From 445fd2f9aa4cfe17093361c8763ecdae1d5b08d9 Mon Sep 17 00:00:00 2001 From: Miha Vrhovnik Date: Wed, 16 May 2012 11:10:06 +0200 Subject: [PATCH 03/12] In console terms columns are width and rows are height --- src/Symfony/Component/Console/Application.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index 2e2abac817..400f7bef8a 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -801,7 +801,7 @@ class Application } if (preg_match("{rows.(\d+);.columns.(\d+);}i", exec('stty -a | grep columns'), $match)) { - return $match[1]; + return $match[2]; } } @@ -817,7 +817,7 @@ class Application } if (preg_match("{rows.(\d+);.columns.(\d+);}i", exec('stty -a | grep columns'), $match)) { - return $match[2]; + return $match[1]; } } From d1c831d7b2c0917ef2b23e624ec86140cfccc302 Mon Sep 17 00:00:00 2001 From: ouardisoft Date: Wed, 16 May 2012 09:17:19 +0000 Subject: [PATCH 04/12] Change must-proxy-revalidate by proxy-revalidate --- src/Symfony/Component/HttpFoundation/Response.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index 65d8607916..96022f0310 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/Response.php @@ -401,7 +401,7 @@ class Response */ public function mustRevalidate() { - return $this->headers->hasCacheControlDirective('must-revalidate') || $this->headers->has('must-proxy-revalidate'); + return $this->headers->hasCacheControlDirective('must-revalidate') || $this->headers->has('proxy-revalidate'); } /** From 6341de025e18b118bb467e3ed8f06130c09c13d5 Mon Sep 17 00:00:00 2001 From: Alexander Deruwe Date: Wed, 16 May 2012 20:34:56 +0200 Subject: [PATCH 05/12] Be more specific in phpdoc (Fixes #3216) --- src/Symfony/Bundle/TwigBundle/TwigEngine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/TwigBundle/TwigEngine.php b/src/Symfony/Bundle/TwigBundle/TwigEngine.php index 639212acc3..e9fdd4806d 100644 --- a/src/Symfony/Bundle/TwigBundle/TwigEngine.php +++ b/src/Symfony/Bundle/TwigBundle/TwigEngine.php @@ -17,7 +17,7 @@ use Symfony\Component\Templating\TemplateNameParserInterface; use Symfony\Component\HttpFoundation\Response; /** - * This engine knows how to render Twig templates. + * This engine renders Twig templates. * * @author Fabien Potencier */ From aaa155edd8eee06613772f0ed09f0b5b3b87f3da Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 May 2012 18:29:55 +0200 Subject: [PATCH 06/12] updated CHANGELOG for 2.0.14 --- CHANGELOG-2.0.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG-2.0.md b/CHANGELOG-2.0.md index f3efeafe51..b0285374f5 100644 --- a/CHANGELOG-2.0.md +++ b/CHANGELOG-2.0.md @@ -7,6 +7,19 @@ in 2.0 minor versions. To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.0.0...v2.0.1 +* 2.0.14 (2012-05-17) + + * d1c831d: Change must-proxy-revalidate by proxy-revalidate + * 445fd2f: In console terms columns are width and rows are height + * 926ac98: [Finder] replaced static by self on a private variable + * 47605f6: [Form][DataMapper] Do not update form to data when form is read only + * c642a5e: [CssSelector] ignored an optional whitespace after a combinator + * cbc3ed3: [HttpKernel] added some constant for better forward compatibility + * 906f6f6: [DependencyInjection] fixed private services removal when used as configurators (closes #3758) + * 970d0b4: [BrowserKit] Check class existence only when required. + * 1ed8b72: Autoloader should not throw exception because PHP will continue to call other registered autoloaders. + * 7fe236a: [Security] Configure ports in RetryAuthenticationEntryPoint according to router settings + * 2.0.13 (2012-04-30) * 5b92b9e: [Console] Selectively output to STDOUT or OUTPUT stream From fe4c0cfafeb92a37d5567040340b7d0d85e0b8b6 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 May 2012 18:30:22 +0200 Subject: [PATCH 07/12] update CONTRIBUTORS for 2.0.14 --- CONTRIBUTORS.md | 53 +++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 080f38b908..5f512337ed 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -20,23 +20,23 @@ Symfony2 is the result of the work of many people who made the code better - Joseph Bielawski (stloyd) - Igor Wiedler (igorw) - Hugo Hamon (hhamon) - - Eriksen Costa (eriksencosta) - William DURAND (willdurand) + - Eriksen Costa (eriksencosta) - Alexandre Salomé (alexandresalome) - stealth35 (stealth35) - Jonathan H. Wage (jwage) - Thibault Duplessis (ornicar) - Jakub Zalas (jakzal) - Eric Clemmons (ericclemmons) + - Martin Hasoň (hason) - Henrik Westphal (snc) - Dariusz Górecki (canni) + - Tobias Schultze (Tobion) - Miha Vrhovnik (mvrhov) - Bulat Shakirzyanov (avalanche123) - - Martin Hasoň (hason) - Henrik Bjørnskov (henrikbjorn) - - Francis Besset (francisbesset) - - Tobias Schultze (Tobion) - Andrej Hudec (pulzarraider) + - Francis Besset (francisbesset) - Kevin Bond (kbond) - Deni (yethee) - Arnout Boks (aboks) @@ -53,8 +53,8 @@ Symfony2 is the result of the work of many people who made the code better - John Wards (johnwards) - Jean-François Simon (jfsimon) - Daniel Holmes (danielholmes) - - Tigran Azatyan (tigranazatyan) - Antoine Hérault (Herzult) + - Tigran Azatyan (tigranazatyan) - Helmer Aaviksoo (helmer) - Jacob Dreesen (jdreesen) - umpirsky (umpirsky) @@ -63,6 +63,7 @@ Symfony2 is the result of the work of many people who made the code better - Fabien Pennequin (FabienPennequin) - Richard Shank (IamPersistent) - Benjamin Dulau (benjamindulau) + - Douglas Greenshields (shieldo) - Christian Raue (craue) - Grégoire Pineau (lyrixx) - Katsuhiro OGAWA (fivestar) @@ -75,6 +76,7 @@ Symfony2 is the result of the work of many people who made the code better - Florin Patan (dlsniper) - Rafael Dohms (rdohms) - Tim Nagel (merk) + - Włodzimierz Gajda (gajdaw) - Michel Weimerskirch (mweimerskirch) - Javier Eguiluz (javiereguiluz) - Joseph Rouff (rouffj) @@ -87,12 +89,12 @@ Symfony2 is the result of the work of many people who made the code better - Gustavo Piltcher - Rui Marinho - Clément JOBEILI (dator) + - Michael Holm (hollodk) - dbu - Julien Brochet (aerialls) - Thomas (rande) - Alexander (asm89) - Gordon Franke (gimler) - - Włodzimierz Gajda (gajdaw) - Noel GUILBERT (noelg) - Alif Rachmawadi (subosito) - Lars Strojny (lstrojny) @@ -102,18 +104,18 @@ Symfony2 is the result of the work of many people who made the code better - Jonathan Ingram (jonathaningram) - Alessandro Desantis (alessandro1997) - Oscar Cubo Medina (ocubom) + - Pablo Godel (pgodel) - Dustin Whittle (dustinwhittle) - Jean-François PHILIPPE (jfphilippe) - Arnaud Le Blanc (arnaud-lb) - Justin Hileman (bobthecow) - Danny Berger (dpb587) - Sven Paulus (subsven) + - Gábor Egyed (1ed) - Xavier Perez (DuoSRX) - Joel Wurtz (Brouznouf) - - Douglas Greenshields (shieldo) - Joe Lencioni (lencioni) - brki (brki) - - Pablo Godel (pgodel) - Francois Zaninotto - Leszek Prabucki (l3l0) - Francois Zaninotto (fzaninotto) @@ -121,20 +123,21 @@ Symfony2 is the result of the work of many people who made the code better - Xavier Montaña Carreras (xmontana) - Andreas Hucks (meandmymonkey) - Arjen Brouwer (arjenjb) - - Michael Holm (hollodk) + - Jérémie Augustin (jaugustin) - Boussekeyt Jules (gordonslondon) - Jan Sorgalla (jsor) + - Daniel Gomes (danielcsgomes) - Lee McDermott (lmcd) - Manuel Reinhard (sprain) - Jeroen Hoek (jdhoek) + - Albert Jessurum (ajessu) - Ryan Rogers (timewasted) - flevour (flevour) - Michel Salib (michelsalib) - geoffrey - Kim Hemsø Rasmussen (kimhemsoe) - - Gábor Egyed (1ed) - - Jérémie Augustin (jaugustin) - Manuel Kiessling (ManuelKiessling) + - Bilal Amarni (bamarni) - Tobias Naumann (tna) - Shein Alexey (conf) - Aurelijus Valeiša (aurelijus) @@ -146,17 +149,21 @@ Symfony2 is the result of the work of many people who made the code better - drak3 (drak3) - Chris Boden (cboden) - Dustin Dobervich (dustin10) + - Sebastian Marek (proofek) + - Olivier Dolbeau (odolbeau) - Michele Orselli (micheleorselli) - Andréia Bohner (andreia) - Sebastian Bergmann (sebastianbergmann) - Miquel Rodríguez Telep (mrtorrent) - Peter Kokot (maastermedia) + - Jérôme Tamarelle (GromNaN) - Jérémy Romey (jeremyFreeAgent) - Yuen-Chi Lian (yclian) - John Bohn (jjbohn) - Greg Thornton (xdissent) - andrewtch (andrewtch) - Costin Bereveanu (schniper) + - Ondrej Slinták (ondrowan) - Markus Lanthaler (lanthaler) - Konstantin Leboev (realmfoo) - Thomas Adam (tecbot) @@ -165,19 +172,18 @@ Symfony2 is the result of the work of many people who made the code better - Matthew Lewinski - Kai - Sergey Linnik (Partugal) - - Albert Jessurum (ajessu) - Johnny Peck (johnnypeck) - Laszlo Korte (laszlokorte) - Hubert LECORCHE (hlecorche) - Sergey Skopin (grizlik) - drmonty (drmonty) - Michael Ridgway (mridgway) + - Anthon Pang (robocoder) - Stepan Tanasiychuk (stfalcon) - Bertrand Zuchuat (Garfield-fr) - - Bilal Amarni (bamarni) + - Sebastien Armand (khepin) + - Sebastiaan Stok (sstok) - Jan Schumann (janschumann) - - Olivier Dolbeau (odolbeau) - - Sebastian Marek (proofek) - Asier Illarramendi (doup) - Shigenobu Nishikawa (shishi) - Marcin Sikoń (marphi) @@ -188,12 +194,11 @@ Symfony2 is the result of the work of many people who made the code better - Pablo Díez (pablodip) - Fran Moreno (franmomu) - Manuel de Ruiter (ManuelAC) - - Ondrej Slinták (ondrowan) - Crell (Crell) - Benoit Tirmarche (mcbennn) - Grégoire Passault + - Ismael Ambrosi (iambrosi) - Tom Klingenberg (ktomk) - - Daniel Gomes (danielcsgomes) - De Cock Xavier (xdecock) - Cristian González Sánchez (cristiangsp) - Nils Adermann (naderman) @@ -205,6 +210,7 @@ Symfony2 is the result of the work of many people who made the code better - Ziumin (Ziumin) - Aurélien Fredouelle (AurelC2G) - Marek Kalnik (marekkalnik) + - Adán Lobato (adanlobato) - Tiago Ribeiro (fixe) - Geoffrey Tran (geoffreytran) - Christian Schaefer (caefer) @@ -220,12 +226,14 @@ Symfony2 is the result of the work of many people who made the code better - Tom Van Looy (tvlooy) - umpirski (umpirski) - Neil Katin + - John Kary (johnkary) - Peter Kokot (peterkokot) - Hossein Bukhamsin (husinluck) - Fabrice Bernhard (fabriceb) - develop - Hiromi Hishida (77web) - Klein Florian (docteurklein) + - Stéphane PY (stephpy) - Joshua Nye (zerosanity) - markchalloner (markchalloner) - Mike Lively (mlively) @@ -234,7 +242,6 @@ Symfony2 is the result of the work of many people who made the code better - Casper Valdemar Poulsen (cvaldemar) - Degory Valentine - Krzysiek Łabuś (Crozin) - - Ismael Ambrosi (iambrosi) - Thomas Bibb (thomasbibb) - Ivan Kurnosov - stloyd @@ -260,6 +267,7 @@ Symfony2 is the result of the work of many people who made the code better - Chris Smith (cs278) - Derek ROTH (DerekRoth) - mwsaz + - corphi (corphi) - Giulio De Donato (liuggio) - Matthias (mpdude) - Emil Einarsson (Einarsson) @@ -290,13 +298,13 @@ Symfony2 is the result of the work of many people who made the code better - Hans (drublic) - m0ppers (m0ppers) - Michael Shtukin (mshtukin) - - Anthon Pang (robocoder) - Teo (teo-sk) - Tony Piper (tonypiper) - sensio - Théophile Helleboid - chtitux (chtitux) - Matthew Lewinski (lewinski) - Markus Bachmann (Baachi) + - scoolen (scoolen) - irmantas (irmantas) - tero (tero) - Vadim Tyukov (vatson) @@ -305,7 +313,6 @@ Symfony2 is the result of the work of many people who made the code better - Tobias Sjösten (tobiassjosten) - Wojciech Sznapka (wowo) - julien.galenski - - John Kary (johnkary) - Martijn Evers (martijn4evers) - Jeremy Bush (zombor) - Evan Villemez (evillemez) @@ -316,11 +323,14 @@ Symfony2 is the result of the work of many people who made the code better - Nicolas Fabre (nfabre) - Clément Herreman (clemherreman) - heccjj (heccjj) + - Ringosan (Ringosan) + - Balázs Benyó (duplabe) - Sebastian Utz (seut) - Cédric Lahouste (RapotOR) - George Giannoulopoulos (dotoree) - Alberto Pirovano (geezmo) - Xavier Briand (xavierbriand) + - Romain Geissler (Romain-Geissler) - Carsten Nielsen (phreaknerd) - JerikVenture (JerikVenture) - Evan Kaufman (EvanK) @@ -363,6 +373,7 @@ Symfony2 is the result of the work of many people who made the code better - cim-dch (cim-dch) - Dan Ordille (dordille) - Martin Mayer (martinmayer) + - Uwe Jäger (uwej711) - Baptiste Clavié (Taluu) - Tuxosaurus (Tuxosaurus) - Hugo Hamon @@ -385,7 +396,6 @@ Symfony2 is the result of the work of many people who made the code better - Jimmy Leger (redpanda) - Nicolas A. Bérard-Nault - Alexey Popkov - - Adán Lobato (adanlobato) - Arnaud Buathier (arnapou) - chesteroni (chesteroni) - Elnur Abdurrakhimov (elnur) @@ -395,6 +405,7 @@ Symfony2 is the result of the work of many people who made the code better - Eugene Babushkin (EugeneBabushkin) - Fabien D. (FabienD) - Matt Drollette (MDrollette) + - Matthieu Moquet (MattKetmo) - Kornienko Alexander (Skorney) - Vincent (Vincent-P) - Drew Butler From b3799680d5b807b726a3a60e6d80f4f0ee582409 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 17 May 2012 18:30:49 +0200 Subject: [PATCH 08/12] updated VERSION for 2.0.14 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 604210568a..537c81479d 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -57,12 +57,12 @@ abstract class Kernel implements KernelInterface protected $startTime; protected $classes; - const VERSION = '2.0.14-DEV'; + const VERSION = '2.0.14'; const VERSION_ID = '20014'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '0'; const RELEASE_VERSION = '14'; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; /** * Constructor. From fff722170044f1e6d66d016c3f23213a034acad1 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Fri, 18 May 2012 00:22:06 +0200 Subject: [PATCH 09/12] Fixed the proxy autoloading for Doctrine 2.2 --- src/Symfony/Bundle/DoctrineBundle/DoctrineBundle.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/DoctrineBundle/DoctrineBundle.php b/src/Symfony/Bundle/DoctrineBundle/DoctrineBundle.php index 4608e2d60e..893a2b36f4 100644 --- a/src/Symfony/Bundle/DoctrineBundle/DoctrineBundle.php +++ b/src/Symfony/Bundle/DoctrineBundle/DoctrineBundle.php @@ -58,7 +58,7 @@ class DoctrineBundle extends Bundle if (1 === Version::compare('2.2.0')) { $originalClassName = substr($className, 0, -5); } else { - $originalClassName = ClassUtils::getRealClass($className); + $originalClassName = ClassUtils::getRealClass($class); $originalClassName = str_replace('\\', '', $originalClassName); } From d1f0c254136f47a1f01f79b1fe4ed0023d1b4d89 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Fri, 18 May 2012 00:28:41 +0200 Subject: [PATCH 10/12] Fixed the composer constraint for Doctrine Common --- composer.json | 2 +- src/Symfony/Bridge/Doctrine/composer.json | 2 +- src/Symfony/Component/Validator/composer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 7a06833ab9..ad69d4449e 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.2", - "doctrine/common": "2.1.*", + "doctrine/common": ">=2.1,<2.3-dev", "monolog/monolog": ">=1.0,<1.2-dev", "swiftmailer/swiftmailer": ">=4.1.2,<4.2-dev", "twig/twig": ">=1.1,<2.0-dev" diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index f9744e04b1..de52336f77 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.2", - "doctrine/common": ">=2.1,<2.3" + "doctrine/common": ">=2.1,<2.3-dev" }, "recommend": { "doctrine/dbal": ">=2.1,<2.3", diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index d27cca3e3f..fbecc0d82f 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.2", - "doctrine/common": ">=2.1,<2.3" + "doctrine/common": ">=2.1,<2.3-dev" }, "suggest": { "symfony/http-foundation": "self.version", From a04acc89438217fadbb3ec78d21db7e7f3fce805 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 18 May 2012 09:50:24 +0200 Subject: [PATCH 11/12] bumped Symfony version to 2.0.15-DEV --- src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 537c81479d..ca0d415ad6 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -57,12 +57,12 @@ abstract class Kernel implements KernelInterface protected $startTime; protected $classes; - const VERSION = '2.0.14'; - const VERSION_ID = '20014'; + const VERSION = '2.0.15-DEV'; + const VERSION_ID = '20015'; const MAJOR_VERSION = '2'; const MINOR_VERSION = '0'; - const RELEASE_VERSION = '14'; - const EXTRA_VERSION = ''; + const RELEASE_VERSION = '15'; + const EXTRA_VERSION = 'DEV'; /** * Constructor. From c9ba077a20cfaaac8764155ed91d344a8dd81e19 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 18 May 2012 19:00:00 +0200 Subject: [PATCH 12/12] added missing LICENSE files --- src/Symfony/Bridge/Doctrine/LICENSE | 19 +++++++++++++++++++ src/Symfony/Bridge/Monolog/LICENSE | 19 +++++++++++++++++++ src/Symfony/Bridge/Swiftmailer/LICENSE | 19 +++++++++++++++++++ src/Symfony/Bridge/Twig/LICENSE | 19 +++++++++++++++++++ .../Bundle/DoctrineAbstractBundle/LICENSE | 19 +++++++++++++++++++ src/Symfony/Bundle/DoctrineBundle/LICENSE | 19 +++++++++++++++++++ src/Symfony/Bundle/FrameworkBundle/LICENSE | 19 +++++++++++++++++++ src/Symfony/Bundle/MonologBundle/LICENSE | 19 +++++++++++++++++++ src/Symfony/Bundle/SecurityBundle/LICENSE | 19 +++++++++++++++++++ src/Symfony/Bundle/SwiftmailerBundle/LICENSE | 19 +++++++++++++++++++ src/Symfony/Bundle/TwigBundle/LICENSE | 19 +++++++++++++++++++ src/Symfony/Bundle/WebProfilerBundle/LICENSE | 19 +++++++++++++++++++ .../Routing/Matcher/ArrayUrlMatcher.php | 0 .../Matcher/RouteCollectionCompiler.php | 0 14 files changed, 228 insertions(+) create mode 100644 src/Symfony/Bridge/Doctrine/LICENSE create mode 100644 src/Symfony/Bridge/Monolog/LICENSE create mode 100644 src/Symfony/Bridge/Swiftmailer/LICENSE create mode 100644 src/Symfony/Bridge/Twig/LICENSE create mode 100644 src/Symfony/Bundle/DoctrineAbstractBundle/LICENSE create mode 100644 src/Symfony/Bundle/DoctrineBundle/LICENSE create mode 100644 src/Symfony/Bundle/FrameworkBundle/LICENSE create mode 100644 src/Symfony/Bundle/MonologBundle/LICENSE create mode 100644 src/Symfony/Bundle/SecurityBundle/LICENSE create mode 100644 src/Symfony/Bundle/SwiftmailerBundle/LICENSE create mode 100644 src/Symfony/Bundle/TwigBundle/LICENSE create mode 100644 src/Symfony/Bundle/WebProfilerBundle/LICENSE create mode 100644 src/Symfony/Component/Routing/Matcher/ArrayUrlMatcher.php create mode 100644 src/Symfony/Component/Routing/Matcher/RouteCollectionCompiler.php diff --git a/src/Symfony/Bridge/Doctrine/LICENSE b/src/Symfony/Bridge/Doctrine/LICENSE new file mode 100644 index 0000000000..cdffe7aebc --- /dev/null +++ b/src/Symfony/Bridge/Doctrine/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2004-2012 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/Symfony/Bridge/Monolog/LICENSE b/src/Symfony/Bridge/Monolog/LICENSE new file mode 100644 index 0000000000..cdffe7aebc --- /dev/null +++ b/src/Symfony/Bridge/Monolog/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2004-2012 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/Symfony/Bridge/Swiftmailer/LICENSE b/src/Symfony/Bridge/Swiftmailer/LICENSE new file mode 100644 index 0000000000..cdffe7aebc --- /dev/null +++ b/src/Symfony/Bridge/Swiftmailer/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2004-2012 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/Symfony/Bridge/Twig/LICENSE b/src/Symfony/Bridge/Twig/LICENSE new file mode 100644 index 0000000000..cdffe7aebc --- /dev/null +++ b/src/Symfony/Bridge/Twig/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2004-2012 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/Symfony/Bundle/DoctrineAbstractBundle/LICENSE b/src/Symfony/Bundle/DoctrineAbstractBundle/LICENSE new file mode 100644 index 0000000000..cdffe7aebc --- /dev/null +++ b/src/Symfony/Bundle/DoctrineAbstractBundle/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2004-2012 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/Symfony/Bundle/DoctrineBundle/LICENSE b/src/Symfony/Bundle/DoctrineBundle/LICENSE new file mode 100644 index 0000000000..cdffe7aebc --- /dev/null +++ b/src/Symfony/Bundle/DoctrineBundle/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2004-2012 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/Symfony/Bundle/FrameworkBundle/LICENSE b/src/Symfony/Bundle/FrameworkBundle/LICENSE new file mode 100644 index 0000000000..cdffe7aebc --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2004-2012 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/Symfony/Bundle/MonologBundle/LICENSE b/src/Symfony/Bundle/MonologBundle/LICENSE new file mode 100644 index 0000000000..cdffe7aebc --- /dev/null +++ b/src/Symfony/Bundle/MonologBundle/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2004-2012 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/Symfony/Bundle/SecurityBundle/LICENSE b/src/Symfony/Bundle/SecurityBundle/LICENSE new file mode 100644 index 0000000000..cdffe7aebc --- /dev/null +++ b/src/Symfony/Bundle/SecurityBundle/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2004-2012 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/Symfony/Bundle/SwiftmailerBundle/LICENSE b/src/Symfony/Bundle/SwiftmailerBundle/LICENSE new file mode 100644 index 0000000000..cdffe7aebc --- /dev/null +++ b/src/Symfony/Bundle/SwiftmailerBundle/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2004-2012 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/Symfony/Bundle/TwigBundle/LICENSE b/src/Symfony/Bundle/TwigBundle/LICENSE new file mode 100644 index 0000000000..cdffe7aebc --- /dev/null +++ b/src/Symfony/Bundle/TwigBundle/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2004-2012 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/Symfony/Bundle/WebProfilerBundle/LICENSE b/src/Symfony/Bundle/WebProfilerBundle/LICENSE new file mode 100644 index 0000000000..cdffe7aebc --- /dev/null +++ b/src/Symfony/Bundle/WebProfilerBundle/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2004-2012 Fabien Potencier + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/src/Symfony/Component/Routing/Matcher/ArrayUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/ArrayUrlMatcher.php new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Symfony/Component/Routing/Matcher/RouteCollectionCompiler.php b/src/Symfony/Component/Routing/Matcher/RouteCollectionCompiler.php new file mode 100644 index 0000000000..e69de29bb2