Merge pull request #114 from moufmouf/rector0.4

Migrating to Rector 0.4

Author: moufmouf

.gitignore

@@ -3,4 +3,6 @@
 /generator/doc/doc-en/
 /generator/doc/entities/generated.ent
 /composer.lock
-/vendor/
+/vendor/
+/generator/tests/rector/0.4/composer.lock
+/generator/tests/rector/0.4/vendor/

.travis.yml

@@ -54,6 +54,7 @@ script:
     echo "Generated files are different from commited files. Please run './safe.php generate' command and commit the results."
     exit 1;
   fi
+- cd generator/tests/rector/0.4 && composer install && composer rector && composer test && cd ../../../..
 
 after_script:
 - cd generator && travis_retry php vendor/bin/php-coveralls -v

README.md

@@ -111,7 +111,7 @@ tool that performs instant refactoring of your application.
 First, you need to install Rector:
 
 ```bash
-$ composer require --dev rector/rector ^0.3
+$ composer require --dev rector/rector ^0.4
 ```
 
 Now, you simply need to run Rector with this command:

generated/ldap.php

@@ -61,14 +61,15 @@ function ldap_add($link_identifier, string $dn, array $entry, array $serverctrls
  * @param resource $link_identifier
  * @param string $bind_rdn
  * @param string $bind_password
+ * @param array $serverctrls
  * @return resource Returns an LDAP result identifier.
  * @throws LdapException
  *
  */
-function ldap_bind_ext($link_identifier, ?string $bind_rdn = null, ?string $bind_password = null)
+function ldap_bind_ext($link_identifier, ?string $bind_rdn = null, ?string $bind_password = null, array $serverctrls = null)
 {
     error_clear_last();
-    $result = \ldap_bind_ext($link_identifier, $bind_rdn, $bind_password);
+    $result = \ldap_bind_ext($link_identifier, $bind_rdn, $bind_password, $serverctrls);
     if ($result === false) {
         throw LdapException::createFromPhpError();
     }
@@ -82,13 +83,14 @@ function ldap_bind_ext($link_identifier, ?string $bind_rdn = null, ?string $bind
  * @param resource $link_identifier An LDAP link identifier, returned by ldap_connect.
  * @param string $bind_rdn
  * @param string $bind_password
+ * @param array $serverctrls Array of LDAP Controls to send with the request.
  * @throws LdapException
  *
  */
-function ldap_bind($link_identifier, ?string $bind_rdn = null, ?string $bind_password = null): void
+function ldap_bind($link_identifier, ?string $bind_rdn = null, ?string $bind_password = null, array $serverctrls = null): void
 {
     error_clear_last();
-    $result = \ldap_bind($link_identifier, $bind_rdn, $bind_password);
+    $result = \ldap_bind($link_identifier, $bind_rdn, $bind_password, $serverctrls);
     if ($result === false) {
         throw LdapException::createFromPhpError();
     }

generator/phpunit.xml.dist

@@ -13,6 +13,9 @@
     <testsuites>
         <testsuite name="Main test Suite">
             <directory>./tests/</directory>
+            <exclude>
+                <directory>./tests/rector</directory>
+            </exclude>
         </testsuite>
     </testsuites>
     <filter>

generator/src/FileCreator.php

@@ -125,9 +125,11 @@ public function generateRectorFile(array $functions, string $path): void
         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 
+        fwrite($stream, "# This rector file is replacing all core PHP functions with the equivalent \"safe\" functions
+# It is targetting Rector 0.4.x versions.
+# If you are using Rector 0.3, please upgrade your Rector version
 services:
-  Rector\Rector\Function_\FunctionReplaceRector:
+  Rector\Rector\Function_\RenameFunctionRector:
     \$oldFunctionToNewFunction:
 ");
         foreach ($functionNames as $functionName) {

generator/tests/rector/0.4/composer.json

@@ -0,0 +1,18 @@
+{
+  "autoload": {
+    "psr-4": {
+      "Test\\": "src/"
+    }
+  },
+  "require": {
+    "php": ">=7.1",
+    "rector/rector": "^0.4"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^7"
+  },
+  "scripts": {
+    "rector": "rector process src/ --config ../../../../rector-migrate.yml",
+    "test": "phpunit"
+  }
+}

generator/tests/rector/0.4/phpunit.xml.dist

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         bootstrap="vendor/autoload.php"
+>
+    <testsuites>
+        <testsuite name="Main test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>

generator/tests/rector/0.4/src/test.php

@@ -0,0 +1,2 @@
+<?php
+glob('*');

generator/tests/rector/0.4/tests/RectorTest.php

@@ -0,0 +1,13 @@
+<?php
+
+
+use PHPUnit\Framework\TestCase;
+
+class RectorTest extends TestCase
+{
+    public function testRectorSucceeded()
+    {
+        $content = file_get_contents(__DIR__.'/../src/test.php');
+        $this->assertContains('Safe', $content);
+    }
+}