Merge branch '2.10'

README.rst

@@ -1547,7 +1547,7 @@ The example below will add two rules to the default list of PSR2 set rules:
 
 **NOTE**: ``exclude`` will work only for directories, so if you need to exclude file, try ``notPath``.
 
-See `Symfony\\Finder <http://symfony.com/doc/current/components/finder.html>`_
+See `Symfony\\Finder <https://symfony.com/doc/current/components/finder.html>`_
 online documentation for other `Finder` methods.
 
 You may also use a blacklist for the rules instead of the above shown whitelist approach.

doc/COOKBOOK-FIXERS.md

@@ -12,13 +12,13 @@ print valid PHP code. It does all transformations in multiple passes,
 a.k.a., multi-pass compiler.
 
 Therefore, a new fixer is meant to be ideally
-[idempotent](http://en.wikipedia.org/wiki/Idempotence#Computer_science_meaning),
+[idempotent](https://en.wikipedia.org/wiki/Idempotence#Computer_science_meaning),
 or at least atomic in its actions. More on this later.
 
 All contributions go through a code review process. Do not feel
 discouraged - it is meant only to give more people more chance to
 contribute, and to detect bugs ([Linus'
-Law](http://en.wikipedia.org/wiki/Linus%27s_Law)).
+Law](https://en.wikipedia.org/wiki/Linus%27s_Law)).
 
 If possible, try to get acquainted with the public interface for the
 [Tokens class](/src/Tokenizer/Tokens.php)
@@ -302,7 +302,7 @@ one of them check if they are preceded by a semicolon symbol.
 
 Now you need to do some reading, because all these symbols obey a list
 defined by the PHP compiler. It is the ["List of Parser
-Tokens"](http://php.net/manual/en/tokens.php).
+Tokens"](https://php.net/manual/en/tokens.php).
 
 Internally, PHP CS Fixer transforms some of PHP native tokens into custom
 tokens through the use of [Transfomers](/src/Tokenizer/Transformer),

phpunit.xml.dist

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     backupGlobals="false"
     backupStaticAttributes="false"

src/Console/Command/HelpCommand.php

@@ -176,7 +176,7 @@ The example below will add two rules to the default list of PSR2 set rules:
 
 **NOTE**: ``exclude`` will work only for directories, so if you need to exclude file, try ``notPath``.
 
-See `Symfony\Finder` (<url>http://symfony.com/doc/current/components/finder.html</url>)
+See `Symfony\Finder` (<url>https://symfony.com/doc/current/components/finder.html</url>)
 online documentation for other `Finder` methods.
 
 You may also use a blacklist for the rules instead of the above shown whitelist approach.

src/Tokenizer/Token.php

@@ -336,7 +336,7 @@ class Token
     /**
      * Generate array containing all predefined constants that exists in PHP version in use.
      *
-     * @see http://php.net/manual/en/language.constants.predefined.php
+     * @see https://php.net/manual/en/language.constants.predefined.php
      *
      * @return array<int, int>
      */
@@ -460,7 +460,7 @@ class Token
     /**
      * Returns if the token is of a Magic constants type.
      *
-     * @see http://php.net/manual/en/language.constants.predefined.php
+     * @see https://php.net/manual/en/language.constants.predefined.php
      *
      * @return bool
      */

src/Tokenizer/Tokens.php

@@ -387,7 +387,7 @@ class Tokens extends \SplFixedArray
                 if (0 === strpos($whitespace, "\r\n")) {
                     $tokens[$index] = new Token([T_OPEN_TAG, rtrim($token->getContent())."\r\n"]);
 
-                    return strlen($whitespace) > 2 // can be removed on PHP 7; http://php.net/manual/en/function.substr.php
+                    return strlen($whitespace) > 2 // can be removed on PHP 7; https://php.net/manual/en/function.substr.php
                         ? substr($whitespace, 2)
                         : ''
                     ;
@@ -395,7 +395,7 @@ class Tokens extends \SplFixedArray
 
                 $tokens[$index] = new Token([T_OPEN_TAG, rtrim($token->getContent()).$whitespace[0]]);
 
-                return strlen($whitespace) > 1 // can be removed on PHP 7; http://php.net/manual/en/function.substr.php
+                return strlen($whitespace) > 1 // can be removed on PHP 7; https://php.net/manual/en/function.substr.php
                     ? substr($whitespace, 1)
                     : ''
                 ;

tests/Fixer/Alias/NoMixedEchoPrintFixerTest.php

@@ -56,7 +56,7 @@ final class NoMixedEchoPrintFixerTest extends AbstractFixerTestCase
                 ',
             ],
             // `echo` can take multiple parameters (although such usage is rare) while `print` can take only one argument,
-            // @see https://secure.php.net/manual/en/function.echo.php and @see https://secure.php.net/manual/en/function.print.php
+            // @see https://php.net/manual/en/function.echo.php and @see https://php.net/manual/en/function.print.php
             [
                 '<?php
                 echo "This ", "string ", "was ", "made ", "with multiple parameters.";
@@ -176,7 +176,7 @@ final class NoMixedEchoPrintFixerTest extends AbstractFixerTestCase
                 ',
             ],
             // echo has no return value while print has a return value of 1 so it can be used in expressions.
-            // http://www.w3schools.com/php/php_echo_print.asp
+            // https://www.w3schools.com/php/php_echo_print.asp
             [
                 '<?php
                 $ret = print "test";

tests/Fixer/Phpdoc/PhpdocInlineTagFixerTest.php

@@ -151,7 +151,7 @@ final class PhpdocInlineTagFixerTest extends AbstractFixerTestCase
         $cases[] = [
             '<?php
     /**
-     * {@link http://www.ietf.org/rfc/rfc1035.text)
+     * {@link https://www.ietf.org/rfc/rfc1035.txt)
      */
     $someVar = "hello";',
         ];

tests/Fixer/Phpdoc/PhpdocSeparationFixerTest.php

@@ -272,7 +272,7 @@ EOF;
      *
      * List of options for $options array with their defaults.
      *
-     * @see http://php.net/session.configuration for options
+     * @see https://php.net/session.configuration for options
      *
      * but we omit 'session.' from the beginning of the keys for convenience.
      *