Merge pull request #6 from runkit7/support-runkit7

Support the plan to deprecate old function/constant names

Author: TysonAndre

.phan/config.php

@@ -192,7 +192,6 @@
 
     // A list of files to include in analysis
     'file_list' => [
-        // 'vendor/phpunit/phpunit/src/Framework/TestCase.php',
     ],
 
     // A file list that defines files that will be excluded
@@ -216,7 +215,6 @@
     // your application should be included in this list.
     'directory_list' => [
         'src',
-        'vendor',
     ],
 
     // List of case-insensitive file extensions supported by Phan.
@@ -235,7 +233,6 @@
     //       should be added to the `directory_list` as
     //       to `exclude_analysis_directory_list`.
     "exclude_analysis_directory_list" => [
-        'vendor',
     ],
 
     // A list of plugin files to execute

.travis.yml

@@ -1,8 +1,8 @@
 language: php
 php:
+  - 7.4
   - 7.3
   - 7.2
-  - 7.1
 
 before_script:
   - ci/install_runkit_for_php_version.sh

ci/install_runkit_for_php_version.sh

@@ -1,11 +1,8 @@
 #!/bin/bash -xeu
 PHP_MAJOR_VERSION=$(php -r "echo PHP_MAJOR_VERSION;");
 
-git clone --depth 1 https://github.com/runkit7/runkit7.git
-pushd runkit7
-phpize && ./configure && make && make install || exit 1
-echo 'extension = runkit.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-popd
+pecl install runkit7-3.1.0a1
+echo 'extension = runkit7.so' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 # Configuration settings needed for running tests.
 echo 'runkit.internal_override = On' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
 # Optional, set error reporting

composer.json

@@ -5,14 +5,12 @@
     "keywords": ["mocks", "testing", "simplestaticmock", "runkit", "runkit7"],
     "type":    "library",
     "require": {
-        "php": ">= 7.0"
-    },
-    "suggest": {
-        "ext-runkit": ">=1.0.5a5 (former name runkit7 was built with)",
-        "ext-runkit7": ">=3.0.0a1"
+        "php": ">= 7.2",
+        "ext-runkit7": ">=3.1.0a1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5"
+        "phpunit/phpunit": "^7.5",
+        "phan/phan": "^3.1.1"
     },
     "autoload": {
         "psr-4": {"SimpleStaticMock\\": "src/SimpleStaticMock"}

src/SimpleStaticMock/MockFunction.php

@@ -59,7 +59,7 @@ class MockFunction
 
     /**
      * @param \Closure|\ReflectionFunctionAbstract $function (ReflectionFunction or ReflectionMethod)
-     *        NOTE: PLAT-2090: Runkit was extremely slow if we keep references to objects around for long.
+     *        NOTE: Runkit7 was extremely slow if we keep references to objects around for long.
      *        Until php 7.0.15, there was a bug in the garbage collector that caused those references to stay around.
      *        As a result, this class and its subclasses were rewritten to avoid keeping a reference to $function in the properties.
      */
@@ -251,7 +251,7 @@ protected function _getStaticVariables(\ReflectionFunctionAbstract $function) :
      *      2 => array('value' => 4000),
      *  );
      *
-     * and the new runkit-redefined method my_class::get_data (the X's represent some sequence of digits)
+     * and the new runkit7-redefined method my_class::get_data (the X's represent some sequence of digits)
      * would be defined as the the following function:
      *
      *  public function getData($id) {
@@ -261,7 +261,7 @@ protected function _getStaticVariables(\ReflectionFunctionAbstract $function) :
      *      );
      *      return $fakeData[$data];
      *  }
-     *  @param array - The static variables of this function.
+     *  @param array $staticVars - The static variables of this function.
      *  @return void
      */
     private function _parseUseClause(array $staticVars)

src/SimpleStaticMock/SimpleStaticMock.php

@@ -121,14 +121,14 @@ public function mock()
 
         $reflectionMethod = new \ReflectionMethod($this->_className, $this->_methodName);
         if ($reflectionMethod->isPrivate()) {
-            $flags = RUNKIT_ACC_PRIVATE;
+            $flags = RUNKIT7_ACC_PRIVATE;
         } elseif ($reflectionMethod->isProtected()) {
-            $flags = RUNKIT_ACC_PROTECTED;
+            $flags = RUNKIT7_ACC_PROTECTED;
         } else {
-            $flags = RUNKIT_ACC_PUBLIC;
+            $flags = RUNKIT7_ACC_PUBLIC;
         }
         if ($reflectionMethod->isStatic()) {
-            $flags |= RUNKIT_ACC_STATIC;
+            $flags |= RUNKIT7_ACC_STATIC;
         }
 
         $reflectionClosure = new \ReflectionFunction($this->_closure);
@@ -148,16 +148,16 @@ public function mock()
         $body = $function->getBody();
 
         // Used to have problems mocking methods with static variables in them.
-        // Seems to work now (new version of runkit) so the code checking for that has been removed.
+        // Seems to work now (new version of runkit7) so the code checking for that has been removed.
 
-        if (!\runkit_method_copy($this->_className, $this->_overrideName, $this->_className, $this->_methodName)) {
-            throw new \RuntimeException($method . ' runkit_method_copy mock');
+        if (!\runkit7_method_copy($this->_className, $this->_overrideName, $this->_className, $this->_methodName)) {
+            throw new \RuntimeException($method . ' runkit7_method_copy mock');
         }
-        if (!\runkit_method_remove($this->_className, $this->_methodName)) {
-            throw new \RuntimeException($method . ' runkit_method_remove mock');
+        if (!\runkit7_method_remove($this->_className, $this->_methodName)) {
+            throw new \RuntimeException($method . ' runkit7_method_remove mock');
         }
-        if (!\runkit_method_add($this->_className, $this->_methodName, $function->getParameters(), $body, $flags)) {
-            throw new \RuntimeException($method . ' runkit_method_add mock');
+        if (!\runkit7_method_add($this->_className, $this->_methodName, $function->getParameters(), $body, $flags)) {
+            throw new \RuntimeException($method . ' runkit7_method_add mock');
         }
 
         // Register object for later destruction.
@@ -175,14 +175,14 @@ public function unmock()
         $method = $this->_classAndMethod();
         if ($this->_isMocked) {
             // echo "Unmock $method\n";
-            if (!\runkit_method_remove($this->_className, $this->_methodName)) {
-                trigger_error($method . ' runkit_method_remove1 unmock');
+            if (!\runkit7_method_remove($this->_className, $this->_methodName)) {
+                trigger_error($method . ' runkit7_method_remove1 unmock');
             }
-            if (!\runkit_method_copy($this->_className, $this->_methodName, $this->_className, $this->_overrideName)) {
-                trigger_error($method . ' runkit_method_copy unmock');
+            if (!\runkit7_method_copy($this->_className, $this->_methodName, $this->_className, $this->_overrideName)) {
+                trigger_error($method . ' runkit7_method_copy unmock');
             }
-            if (!\runkit_method_remove($this->_className, $this->_overrideName)) {
-                trigger_error($method . ' runkit_method_remove2 unmock');
+            if (!\runkit7_method_remove($this->_className, $this->_overrideName)) {
+                trigger_error($method . ' runkit7_method_remove2 unmock');
             }
             $this->_isMocked = false;
             self::$_counts[$method] = [];