reverted: --- b/core/assets/vendor/jquery-form/jquery.form.js +++ a/core/assets/vendor/jquery-form/jquery.form.js @@ -72,7 +72,7 @@ var hasProp = !!$.fn.prop; // attr2 uses prop when it can but checks the return type for +// an expected string. this accounts for the case where a form -// an expected string. this accounts for the case where a form // contains inputs with names like "action" or "method"; in those // cases "prop" returns the element $.fn.attr2 = function() { @@ -461,7 +461,7 @@ var CLIENT_TIMEOUT_ABORT = 1; var SERVER_ABORT = 2; + - function getDoc(frame) { /* it looks like contentWindow or contentDocument do not * carry the protocol property in ie8, when running under ssl @@ -469,9 +469,9 @@ * the protocol is know but not on the other two objects. strange? * "Same origin policy" http://en.wikipedia.org/wiki/Same_origin_policy */ + - var doc = null; + - // IE8 cascading access check try { if (frame.contentWindow) { @@ -619,7 +619,7 @@ if (xhr.aborted || callbackProcessed) { return; } + - doc = getDoc(io); if(!doc) { log('cannot access response document'); reverted: --- b/core/modules/filter/tests/filter.url-input.txt +++ a/core/modules/filter/tests/filter.url-input.txt @@ -30,7 +30,7 @@ +This is the end! \ No newline at end of file -This is the end! reverted: --- b/core/modules/filter/tests/filter.url-output.txt +++ a/core/modules/filter/tests/filter.url-output.txt @@ -30,7 +30,7 @@ +This is the end! \ No newline at end of file -This is the end! reverted: --- b/core/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php +++ a/core/vendor/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php @@ -167,7 +167,7 @@ { return new self(sprintf( '[Enum Error] Attribute "%s" of @%s declared on %s accept only [%s], but got %s.', + $attributeName, - $attributeName, $annotationName, $context, implode(', ', $available), reverted: --- b/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CouchbaseCacheTest.php +++ a/core/vendor/doctrine/cache/tests/Doctrine/Tests/Common/Cache/CouchbaseCacheTest.php @@ -15,14 +15,14 @@ try { $this->couchbase = new Couchbase('127.0.0.1', 'Administrator', 'password', 'default'); } catch(Exception $ex) { + $this->markTestSkipped('Could not instantiate the Couchbase cache because of: ' . $ex); - $this->markTestSkipped('Could not instantiate the Couchbase cache because of: ' . $ex); } } else { $this->markTestSkipped('The ' . __CLASS__ .' requires the use of the couchbase extension'); } } + public function testNoExpire() - public function testNoExpire() { $cache = $this->_getCacheDriver(); $cache->save('noexpire', 'value', 0); reverted: --- b/core/vendor/doctrine/cache/tests/travis/phpunit.travis.xml +++ a/core/vendor/doctrine/cache/tests/travis/phpunit.travis.xml @@ -26,7 +26,7 @@ ../../lib/Doctrine/ + - performance reverted: --- b/core/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Collection.php +++ a/core/vendor/doctrine/collections/lib/Doctrine/Common/Collections/Collection.php @@ -204,7 +204,7 @@ /** * Tests whether the given predicate p holds for all elements of this collection. + * - * * @param Closure $p The predicate. * * @return boolean TRUE, if the predicate yields TRUE for all elements, FALSE otherwise. reverted: --- b/core/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php +++ a/core/vendor/doctrine/common/lib/Doctrine/Common/Util/Debug.php @@ -76,11 +76,11 @@ $dumpText = ($stripTags ? strip_tags(html_entity_decode($dump)) : $dump); ini_set('html_errors', $html); + - if ($echo) { echo $dumpText; } + - return $dumpText; } reverted: --- b/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Reflection/ExampleAnnotationClass.php +++ a/core/vendor/doctrine/common/tests/Doctrine/Tests/Common/Reflection/ExampleAnnotationClass.php @@ -11,4 +11,4 @@ */ class ExampleAnnotationClass { +} -} reverted: --- b/core/vendor/doctrine/inflector/tests/Doctrine/Tests/Common/Inflector/InflectorTest.php +++ a/core/vendor/doctrine/inflector/tests/Doctrine/Tests/Common/Inflector/InflectorTest.php @@ -12,10 +12,10 @@ * Singular & Plural test data. Returns an array of sample words. * * @return array + */ - */ public function dataSampleWords() { Inflector::reset(); + // in the format array('singular', 'plural') - // in the format array('singular', 'plural') return array( array('categoria', 'categorias'), array('house', 'houses'), reverted: --- b/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Namespace.php +++ a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Namespace.php @@ -333,7 +333,7 @@ "\$shortUri should be a string and cannot be null or empty" ); } + - if ($shortUri === 'a') { return self::$namespaces['rdf'] . 'type'; } elseif (preg_match("/^(\w+?):([\w\-]+)$/", $shortUri, $matches)) { reverted: --- b/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Exception.php +++ a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Exception.php @@ -48,7 +48,7 @@ { protected $parserLine; protected $parserColumn; + - public function __construct($message, $line = null, $column = null) { $this->parserLine = $line; @@ -63,12 +63,12 @@ parent::__construct($message); } + - public function getParserLine() { return $this->parserLine; } + - public function getParserColumn() { return $this->parserColumn; reverted: --- b/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Turtle.php +++ a/core/vendor/easyrdf/easyrdf/lib/EasyRdf/Parser/Turtle.php @@ -43,10 +43,10 @@ * * It is a translation from Java to PHP of the Sesame Turtle Parser: * http://bit.ly/TurtleParser + * + * Lasted updated against version: - * - * Lasted updated against version: * ecda6a15a200a2fc6a062e2e43081257c3ccd4e6 (Mon Jul 29 12:05:58 2013) + * - * * @package EasyRdf * @copyright Copyright (c) 2009-2013 Nicholas J Humfrey * Copyright (c) 1997-2013 Aduna (http://www.aduna-software.com/) @@ -59,7 +59,7 @@ protected $subject; protected $predicate; protected $object; + - protected $line; protected $column; @@ -96,7 +96,7 @@ $this->subject = null; $this->predicate = null; $this->object = null; + - $this->line = 1; $this->column = 1; reverted: --- b/core/vendor/easyrdf/easyrdf/scripts/copyright_updater.php +++ a/core/vendor/easyrdf/easyrdf/scripts/copyright_updater.php @@ -11,18 +11,18 @@ foreach (preg_split("/[\r\n]/", $contents) as $line) { if (preg_match("/^(.+)Copyright\s+\(c\)\s+(\d+)-?(\d*) (Nicholas.+)$/", $line, $m)) { $copy_statements++; + - if ($m[2] != $year and $m[3] != $year) { // Change the line $line = "$m[1]Copyright (c) $m[2]-$year $m[4]"; } } + - // Remove trailing whitespace $line = rtrim($line); $output .= "$line\n"; } + - // Remove surplus line endings while (substr($output, -2) == "\n\n") { $output = substr($output, 0, -1); @@ -38,7 +38,7 @@ function process_directory($path) { $dir = opendir($path); + - while ($file = readdir($dir)) { if (substr($file, 0, 1) == '.') { continue; @@ -55,8 +55,8 @@ print "Unknown type: $filepath\n"; } } + + closedir($dir); - - closedir($dir); } process_directory($ROOT . '/examples'); reverted: --- b/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php +++ a/core/vendor/phpunit/phpunit/tests/_files/CoverageFunctionParenthesesWhitespaceTest.php @@ -2,7 +2,7 @@ class CoverageFunctionParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase { /** + * @covers ::globalFunction ( ) - * @covers ::globalFunction ( ) */ public function testSomething() { reverted: --- b/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php +++ a/core/vendor/phpunit/phpunit/tests/_files/CoverageMethodParenthesesWhitespaceTest.php @@ -2,7 +2,7 @@ class CoverageMethodParenthesesWhitespaceTest extends PHPUnit_Framework_TestCase { /** + * @covers CoveredClass::publicMethod ( ) - * @covers CoveredClass::publicMethod ( ) */ public function testSomething() { reverted: --- b/core/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php +++ a/core/vendor/phpunit/phpunit/tests/_files/RequirementsTest.php @@ -140,8 +140,8 @@ } /** + * @requires extension spl + * @requires OS .* - * @requires extension spl - * @requires OS .* */ public function testSpace() { reverted: --- b/core/vendor/psr/log/Psr/Log/LoggerAwareTrait.php +++ a/core/vendor/psr/log/Psr/Log/LoggerAwareTrait.php @@ -12,7 +12,7 @@ /** * Sets a logger. + * - * * @param LoggerInterface $logger */ public function setLogger(LoggerInterface $logger) reverted: --- b/core/vendor/psr/log/Psr/Log/LoggerTrait.php +++ a/core/vendor/psr/log/Psr/Log/LoggerTrait.php @@ -6,8 +6,8 @@ * This is a simple Logger trait that classes unable to extend AbstractLogger * (because they extend another class, etc) can include. * + * It simply delegates all log-level-specific methods to the `log` method to + * reduce boilerplate code that a simple Logger that does the same thing with - * It simply delegates all log-level-specific methods to the `log` method to - * reduce boilerplate code that a simple Logger that does the same thing with * messages regardless of the error level has to implement. */ trait LoggerTrait reverted: --- b/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/dotdot.test +++ a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/dotdot.test @@ -13,8 +13,8 @@ --DATA-- return array('foo' => array(1, 10)) --EXPECT-- +0 1 2 3 4 5 6 7 8 9 10 +a b c d e f g h i j k l m n o p q r s t u v w x y z +A B C D E F G H I J K L M N O P Q R S T U V W X Y Z +1 2 3 4 5 6 7 8 9 10 -0 1 2 3 4 5 6 7 8 9 10 -a b c d e f g h i j k l m n o p q r s t u v w x y z -A B C D E F G H I J K L M N O P Q R S T U V W X Y Z -1 2 3 4 5 6 7 8 9 10 1 2 3 4 5 6 7 8 9 reverted: --- b/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/literals.test +++ a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/literals.test @@ -14,9 +14,9 @@ --EXPECT-- 1 1 2 1 +3 +4 +5 +6 +7 +8 -3 -4 -5 -6 -7 -8 reverted: --- b/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test +++ a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test @@ -6,12 +6,12 @@ (escape_and_nl2br is an escaper filter) 1. Don't escape escaper filter output +( var is escaped by |escape_and_nl2br, line-breaks are added, -( var is escaped by |escape_and_nl2br, line-breaks are added, the output is not escaped ) {{ var|escape_and_nl2br }} 2. Don't escape escaper filter output +( var is escaped by |escape_and_nl2br, line-breaks are added, -( var is escaped by |escape_and_nl2br, line-breaks are added, the output is not escaped, |raw is redundant ) {{ var|escape_and_nl2br|raw }} @@ -67,13 +67,13 @@ (escape_and_nl2br is an escaper filter) 1. Don't escape escaper filter output +( var is escaped by |escape_and_nl2br, line-breaks are added, -( var is escaped by |escape_and_nl2br, line-breaks are added, the output is not escaped ) <Fabien>
Twig 2. Don't escape escaper filter output +( var is escaped by |escape_and_nl2br, line-breaks are added, -( var is escaped by |escape_and_nl2br, line-breaks are added, the output is not escaped, |raw is redundant ) <Fabien>
Twig reverted: --- b/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/nested.test +++ a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/nested.test @@ -29,7 +29,7 @@ A block1 + - A block1 reverted: --- b/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/with_extends.test +++ a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/with_extends.test @@ -47,7 +47,7 @@ blockc2base + - A block1 reverted: --- b/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects.test +++ a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects.test @@ -33,7 +33,7 @@ * foo * 2/1 + * - * * foo/bar reverted: --- b/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test +++ a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test @@ -21,7 +21,7 @@ --EXPECT-- INSIDE OVERRIDDEN + - BEFORE BAR reverted: --- b/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/trim_block.test +++ a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/trim_block.test @@ -17,9 +17,9 @@ Trim comments: + - {#- Invisible -#} + - After the comment. Trim leading space: @@ -35,7 +35,7 @@ Trim trailing space: +{% if trailing -%} -{% if trailing -%} {{ trailing -}} {% endif -%}