Merge pull request #209 from localheinz/fix/rector

Fix: Drop support for unsupported versions of rector/rector

Author: Kharhamel

.github/workflows/continuous-integration.yml

@@ -89,13 +89,10 @@ jobs:
             echo "Generated files are different from commited files. Please run './safe.php generate' command and commit the results."
             exit 1;
           fi
-      - name: "Check if refactoring can be done with rector/rector:~0.5.0"
-        run: "composer install && composer rector && composer test"
-        working-directory: "generator/tests/rector/0.5"
 
-      - name: "Check if refactoring can be done with rector/rector:~0.6.0"
+      - name: "Check if refactoring can be done with rector/rector:~0.7.0"
         run: "composer install && composer rector && composer test"
-        working-directory: "generator/tests/rector/0.6"
+        working-directory: "generator/tests/rector/0.7"
 
       - name: "Archive code coverage results"
         uses: "actions/upload-artifact@v1"

.gitignore

@@ -4,6 +4,5 @@
 /generator/doc/entities/generated.ent
 /composer.lock
 vendor/
-/generator/tests/rector/0.5/composer.lock
-/generator/tests/rector/0.6/composer.lock
+/generator/tests/rector/0.7/composer.lock
 .phpunit.result.cache

README.md

@@ -112,18 +112,22 @@ find these functions but changing the namespace of the functions one function at
 Fortunately, Safe comes bundled with a "Rector" configuration file. [Rector](https://github.com/rectorphp/rector) is a command-line
 tool that performs instant refactoring of your application.
 
-First, you need to install Rector:
+Run
 
 ```bash
-$ composer require --dev rector/rector ^0.6
+$ composer require --dev rector/rector:^0.7
 ```
 
-Now, you simply need to run Rector with this command:
+to install `rector/rector`.
+
+Run
 
 ```bash
-vendor/bin/rector process src/ --config vendor/thecodingmachine/safe/rector-migrate-0.6.yml
+vendor/bin/rector process src/ --config vendor/thecodingmachine/safe/rector-migrate-0.7.yml
 ```
 
+to run `rector/rector`.
+
 *Note:* do not forget to replace "src/" with the path to your source directory.
 
 **Important:** the refactoring only performs a "dumb" replacement of functions. It will not modify the way

generated/curl.php

@@ -1656,6 +1656,14 @@ function curl_multi_init()
  * CURL_SSLVERSION_TLSv1_0 (4),
  * CURL_SSLVERSION_TLSv1_1 (5) or
  * CURL_SSLVERSION_TLSv1_2 (6).
+ * The maximum TLS version can be set by using one of the CURL_SSLVERSION_MAX_*
+ * constants. It is also possible to OR one of the CURL_SSLVERSION_*
+ * constants with one of the CURL_SSLVERSION_MAX_* constants.
+ * CURL_SSLVERSION_MAX_DEFAULT (the maximum version supported by the library),
+ * CURL_SSLVERSION_MAX_TLSv1_0,
+ * CURL_SSLVERSION_MAX_TLSv1_1,
+ * CURL_SSLVERSION_MAX_TLSv1_2, or
+ * CURL_SSLVERSION_MAX_TLSv1_3.
  *
  *
  * Your best bet is to not set this and let it use the default.
@@ -1715,7 +1723,7 @@ function curl_multi_init()
  * CURL_SSLVERSION_TLSv1_3,
  * CURL_SSLVERSION_MAX_DEFAULT,
  * CURL_SSLVERSION_MAX_TLSv1_0,
- * CURL_SSLVERSION_MAX_TLSv1_2,
+ * CURL_SSLVERSION_MAX_TLSv1_1,
  * CURL_SSLVERSION_MAX_TLSv1_2,
  * CURL_SSLVERSION_MAX_TLSv1_3 or
  * CURL_SSLVERSION_SSLv3.
@@ -1740,6 +1748,42 @@ function curl_multi_init()
  *
  *
  *
+ * CURLOPT_TCP_KEEPALIVE
+ *
+ * If set to 1, TCP keepalive probes will be sent. The delay and
+ * frequency of these probes can be controlled by the CURLOPT_TCP_KEEPIDLE
+ * and CURLOPT_TCP_KEEPINTVL options, provided the operating system
+ * supports them. If set to 0 (default) keepalive probes are disabled.
+ *
+ *
+ * Added in cURL 7.25.0. Available since PHP 5.5.0.
+ *
+ *
+ *
+ * CURLOPT_TCP_KEEPIDLE
+ *
+ * Sets the delay, in seconds, that the operating system will wait while the connection is
+ * idle before sending keepalive probes, if CURLOPT_TCP_KEEPALIVE is
+ * enabled. Not all operating systems support this option.
+ * The default is 60.
+ *
+ *
+ * Added in cURL 7.25.0. Available since PHP 5.5.0.
+ *
+ *
+ *
+ * CURLOPT_TCP_KEEPINTVL
+ *
+ * Sets the interval, in seconds, that the operating system will wait between sending
+ * keepalive probes, if CURLOPT_TCP_KEEPALIVE is enabled.
+ * Not all operating systems support this option.
+ * The default is 60.
+ *
+ *
+ * Added in cURL 7.25.0. Available since PHP 5.5.0.
+ *
+ *
+ *
  * CURLOPT_TIMECONDITION
  *
  * How CURLOPT_TIMEVALUE is treated.
@@ -2016,6 +2060,20 @@ function curl_multi_init()
  *
  *
  *
+ * CURLOPT_COOKIELIST
+ *
+ * A cookie string (i.e. a single line in Netscape/Mozilla format, or a regular
+ * HTTP-style Set-Cookie header) adds that single cookie to the internal cookie store.
+ * "ALL" erases all cookies held in memory.
+ * "SESS" erases all session cookies held in memory.
+ * "FLUSH" writes all known cookies to the file specified by CURLOPT_COOKIEJAR.
+ * "RELOAD" loads all cookies from the files specified by CURLOPT_COOKIEFILE.
+ *
+ *
+ * Available since PHP 5.5.0 and cURL 7.14.1.
+ *
+ *
+ *
  * CURLOPT_CUSTOMREQUEST
  *
  * A custom request method to use instead of
@@ -2541,6 +2599,8 @@ function curl_multi_init()
  * The format of the certificate. Supported formats are
  * "PEM" (default), "DER",
  * and "ENG".
+ * As of OpenSSL 0.9.3, "P12" (for PKCS#12-encoded files)
+ * is also supported.
  *
  *
  * Added in cURL 7.9.3.

generated/mysql.php

@@ -132,7 +132,7 @@ function mysql_create_db(string $database_name, $link_identifier = null): void
  * row_number should be a value in the range from 0 to
  * mysql_num_rows - 1. However if the result set
  * is empty (mysql_num_rows == 0), a seek to 0 will
- * fail with a E_WARNING and
+ * fail with an E_WARNING and
  * mysql_data_seek will return FALSE.
  *
  * @param resource $result The result resource that

generated/openssl.php

@@ -84,7 +84,7 @@ function openssl_csr_export($csr, ?string &$out, bool $notext = true): void
  * array - if shortnames is TRUE (the default) then
  * fields will be indexed with the short name form, otherwise, the long name
  * form will be used - e.g.: CN is the shortname form of commonName.
- * @return array Returns TRUE on success.
+ * @return array Returns an associative array with subject description.
  * @throws OpensslException
  *
  */

generator/src/FileCreator.php

@@ -81,40 +81,13 @@ public function generateFunctionsList(array $functions, string $path): void
         fclose($stream);
     }
 
-    /**
-     * @deprecated Official support for rector/rector:~0.5 is not advertised anymore.
-     *
-     * This function generate a rector yml file containing a replacer for all functions
-     *
-     * @param Method[] $functions
-     * @param string $path
-     */
-    public function generateRectorFile(array $functions, string $path): void
-    {
-        $functionNames = $this->getFunctionsNameList($functions);
-        $stream = fopen($path, 'w');
-        if ($stream === false) {
-            throw new \RuntimeException('Unable to write to '.$path);
-        }
-        fwrite($stream, "# This rector file is replacing all core PHP functions with the equivalent \"safe\" functions
-# It is targetting Rector 0.5.x versions.
-# If you are using Rector 0.4, please upgrade your Rector version
-services:
-  Rector\Renaming\Rector\Function_\RenameFunctionRector:
-");
-        foreach ($functionNames as $functionName) {
-            fwrite($stream, '    '.$functionName.": 'Safe\\".$functionName."'\n");
-        }
-        fclose($stream);
-    }
-
     /**
      * Generates a configuration file for replacing all functions when using rector/rector:~0.6.
      *
      * @param Method[] $functions
      * @param string $path
      */
-    public function generateRectorFileForZeroPointSix(array $functions, string $path): void
+    public function generateRectorFileForZeroPointSeven(array $functions, string $path): void
     {
         $functionNames = $this->getFunctionsNameList($functions);
 
@@ -125,7 +98,7 @@ public function generateRectorFileForZeroPointSix(array $functions, string $path
         }
 
         $header = <<<'TXT'
-# This file configures rector/rector:~0.6.0 to replace all PHP functions with their equivalent "safe" functions
+# This file configures rector/rector:~0.7.0 to replace all PHP functions with their equivalent "safe" functions
 
 services:
   Rector\Renaming\Rector\Function_\RenameFunctionRector:

generator/src/GenerateCommand.php

@@ -37,8 +37,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $fileCreator = new FileCreator();
         $fileCreator->generatePhpFile($functions, __DIR__ . '/../../generated/');
         $fileCreator->generateFunctionsList($functions, __DIR__ . '/../../generated/functionsList.php');
-        $fileCreator->generateRectorFile($functions, __DIR__ . '/../../rector-migrate.yml');
-        $fileCreator->generateRectorFileForZeroPointSix($functions, __DIR__ . '/../../rector-migrate-0.6.yml');
+        $fileCreator->generateRectorFileForZeroPointSeven($functions, __DIR__ . '/../../rector-migrate-0.7.yml');
 
 
         $modules = [];