Merge branch '2.3' into 2.5

fabpot · fabpot · commit 0baf7892af10 · 2014-12-29T11:02:13.000+01:00
* 2.3:
  No global state for isolated tests and other fixes
  [TwigBundle] Moved the setting of the default escaping strategy from the Twig engine to the Twig environment
  [Debug] fix checkip6
  [HttpFoundation] fixed error when an IP in the X-Forwarded-For HTTP header contains a port
  Update the note about origins of the CssSelector component.
  Use the correct cssselect library name in docblocks.
diff --git a/CssSelector.php b/CssSelector.php
@@ -24,7 +24,7 @@
  *
  * $xpath = CssSelector::toXpath('h1.foo');
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * Copyright (c) 2007-2012 Ian Bicking and contributors. See AUTHORS
diff --git a/Exception/ExceptionInterface.php b/Exception/ExceptionInterface.php
@@ -14,7 +14,7 @@
 /**
  * Interface for exceptions.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Exception/ExpressionErrorException.php b/Exception/ExpressionErrorException.php
@@ -14,7 +14,7 @@
 /**
  * ParseException is thrown when a CSS selector syntax is not valid.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Exception/InternalErrorException.php b/Exception/InternalErrorException.php
@@ -14,7 +14,7 @@
 /**
  * ParseException is thrown when a CSS selector syntax is not valid.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Exception/ParseException.php b/Exception/ParseException.php
@@ -14,7 +14,7 @@
 /**
  * ParseException is thrown when a CSS selector syntax is not valid.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Fabien Potencier <fabien@symfony.com>
diff --git a/Exception/SyntaxErrorException.php b/Exception/SyntaxErrorException.php
@@ -16,7 +16,7 @@
 /**
  * ParseException is thrown when a CSS selector syntax is not valid.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Node/AbstractNode.php b/Node/AbstractNode.php
@@ -14,7 +14,7 @@
 /**
  * Abstract base node class.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Node/AttributeNode.php b/Node/AttributeNode.php
@@ -14,7 +14,7 @@
 /**
  * Represents a "<selector>[<namespace>|<attribute> <operator> <value>]" node.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Node/ClassNode.php b/Node/ClassNode.php
@@ -14,7 +14,7 @@
 /**
  * Represents a "<selector>.<name>" node.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Node/CombinedSelectorNode.php b/Node/CombinedSelectorNode.php
@@ -14,7 +14,7 @@
 /**
  * Represents a combined node.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Node/ElementNode.php b/Node/ElementNode.php
@@ -14,7 +14,7 @@
 /**
  * Represents a "<namespace>|<element>" node.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Node/FunctionNode.php b/Node/FunctionNode.php
@@ -16,7 +16,7 @@
 /**
  * Represents a "<selector>:<name>(<arguments>)" node.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Node/HashNode.php b/Node/HashNode.php
@@ -14,7 +14,7 @@
 /**
  * Represents a "<selector>#<id>" node.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Node/NegationNode.php b/Node/NegationNode.php
@@ -14,7 +14,7 @@
 /**
  * Represents a "<selector>:not(<identifier>)" node.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Node/NodeInterface.php b/Node/NodeInterface.php
@@ -14,7 +14,7 @@
 /**
  * Interface for nodes.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Node/PseudoNode.php b/Node/PseudoNode.php
@@ -14,7 +14,7 @@
 /**
  * Represents a "<selector>:<identifier>" node.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Node/SelectorNode.php b/Node/SelectorNode.php
@@ -14,7 +14,7 @@
 /**
  * Represents a "<selector>(::|:)<pseudoElement>" node.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Node/Specificity.php b/Node/Specificity.php
@@ -14,7 +14,7 @@
 /**
  * Represents a node specificity.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @see http://www.w3.org/TR/selectors/#specificity
diff --git a/Parser/Handler/CommentHandler.php b/Parser/Handler/CommentHandler.php
@@ -17,7 +17,7 @@
 /**
  * CSS selector comment handler.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Handler/HandlerInterface.php b/Parser/Handler/HandlerInterface.php
@@ -17,7 +17,7 @@
 /**
  * CSS selector handler interface.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Handler/HashHandler.php b/Parser/Handler/HashHandler.php
@@ -20,7 +20,7 @@
 /**
  * CSS selector comment handler.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Handler/IdentifierHandler.php b/Parser/Handler/IdentifierHandler.php
@@ -20,7 +20,7 @@
 /**
  * CSS selector comment handler.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Handler/NumberHandler.php b/Parser/Handler/NumberHandler.php
@@ -19,7 +19,7 @@
 /**
  * CSS selector comment handler.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Handler/StringHandler.php b/Parser/Handler/StringHandler.php
@@ -22,7 +22,7 @@
 /**
  * CSS selector comment handler.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Handler/WhitespaceHandler.php b/Parser/Handler/WhitespaceHandler.php
@@ -18,7 +18,7 @@
 /**
  * CSS selector whitespace handler.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Parser.php b/Parser/Parser.php
@@ -18,7 +18,7 @@
 /**
  * CSS selector parser.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/ParserInterface.php b/Parser/ParserInterface.php
@@ -16,7 +16,7 @@
 /**
  * CSS selector parser interface.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Reader.php b/Parser/Reader.php
@@ -14,7 +14,7 @@
 /**
  * CSS selector reader.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Shortcut/ClassParser.php b/Parser/Shortcut/ClassParser.php
@@ -19,7 +19,7 @@
 /**
  * CSS selector class parser shortcut.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Shortcut/ElementParser.php b/Parser/Shortcut/ElementParser.php
@@ -18,7 +18,7 @@
 /**
  * CSS selector element parser shortcut.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Shortcut/EmptyStringParser.php b/Parser/Shortcut/EmptyStringParser.php
@@ -22,7 +22,7 @@
  * - The parser fails to parse an empty string.
  * - In the previous version, an empty string matches each tags.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Shortcut/HashParser.php b/Parser/Shortcut/HashParser.php
@@ -19,7 +19,7 @@
 /**
  * CSS selector hash parser shortcut.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Token.php b/Parser/Token.php
@@ -14,7 +14,7 @@
 /**
  * CSS selector token.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/TokenStream.php b/Parser/TokenStream.php
@@ -17,7 +17,7 @@
 /**
  * CSS selector token stream.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Tokenizer/Tokenizer.php b/Parser/Tokenizer/Tokenizer.php
@@ -19,7 +19,7 @@
 /**
  * CSS selector tokenizer.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Tokenizer/TokenizerEscaping.php b/Parser/Tokenizer/TokenizerEscaping.php
@@ -14,7 +14,7 @@
 /**
  * CSS selector tokenizer escaping applier.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/Parser/Tokenizer/TokenizerPatterns.php b/Parser/Tokenizer/TokenizerPatterns.php
@@ -14,7 +14,7 @@
 /**
  * CSS selector tokenizer patterns builder.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/README.md b/README.md
@@ -36,10 +36,9 @@ names are lower-cased, the following extra pseudo-classes are supported:
 Resources
 ---------
 
-This component is a port of the Python lxml library, which is copyright Infrae
-and distributed under the BSD license.
-
-Current code is a port of https://github.com/SimonSapin/cssselect/releases/tag/v0.7.1
+This component is a port of the Python cssselect library
+[v0.7.1](https://github.com/SimonSapin/cssselect/releases/tag/v0.7.1),
+which is distributed under the BSD license.
 
 You can run the unit tests with the following command:
 
diff --git a/XPath/Extension/AbstractExtension.php b/XPath/Extension/AbstractExtension.php
@@ -14,7 +14,7 @@
 /**
  * XPath expression translator abstract extension.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/XPath/Extension/AttributeMatchingExtension.php b/XPath/Extension/AttributeMatchingExtension.php
@@ -17,7 +17,7 @@
 /**
  * XPath expression translator attribute extension.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/XPath/Extension/CombinationExtension.php b/XPath/Extension/CombinationExtension.php
@@ -16,7 +16,7 @@
 /**
  * XPath expression translator combination extension.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/XPath/Extension/ExtensionInterface.php b/XPath/Extension/ExtensionInterface.php
@@ -14,7 +14,7 @@
 /**
  * XPath expression translator extension interface.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/XPath/Extension/FunctionExtension.php b/XPath/Extension/FunctionExtension.php
@@ -21,7 +21,7 @@
 /**
  * XPath expression translator function extension.
  *
- * This component is a port of the Python cssselector library,
+ * This component is a port of the Python cssselect library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
  * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
diff --git a/XPath/Extension/HtmlExtension.php b/XPath/Extension/HtmlExtension.php
diff --git a/XPath/Extension/NodeExtension.php b/XPath/Extension/NodeExtension.php
diff --git a/XPath/Extension/PseudoClassExtension.php b/XPath/Extension/PseudoClassExtension.php
diff --git a/XPath/Translator.php b/XPath/Translator.php
diff --git a/XPath/TranslatorInterface.php b/XPath/TranslatorInterface.php
diff --git a/XPath/XPathExpr.php b/XPath/XPathExpr.php

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*`
`25`	`25`	`* $xpath = CssSelector::toXpath('h1.foo');`
`26`	`26`	`*`
`27`		`- * This component is a port of the Python cssselector library,`
	`27`	`+ * This component is a port of the Python cssselect library,`
`28`	`28`	`* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.`
`29`	`29`	`*`
`30`	`30`	`* Copyright (c) 2007-2012 Ian Bicking and contributors. See AUTHORS`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`/**`
`15`	`15`	`* Interface for exceptions.`
`16`	`16`	`*`
`17`		`- * This component is a port of the Python cssselector library,`
	`17`	`+ * This component is a port of the Python cssselect library,`
`18`	`18`	`* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.`
`19`	`19`	`*`
`20`	`20`	`* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`/**`
`17`	`17`	`* ParseException is thrown when a CSS selector syntax is not valid.`
`18`	`18`	`*`
`19`		`- * This component is a port of the Python cssselector library,`
	`19`	`+ * This component is a port of the Python cssselect library,`
`20`	`20`	`* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.`
`21`	`21`	`*`
`22`	`22`	`* @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>`