Merge pull request php-vcr#340 from php-vcr/2021-update

2021 update

Author: JeroenVanOort

.gitignore

@@ -7,3 +7,4 @@ tests/fixtures/cassette*
 /.php_cs.cache
 /.php_cs
 composer.lock
+.phpunit.result.cache

.php_cs.dist

@@ -2,10 +2,14 @@
 
 return PhpCsFixer\Config::create()
  ->setRules([
- '@PSR2' => true,
+ '@PSR12' => true,
  '@Symfony' => true,
  '@Symfony:risky' => true,
- '@PHPUnit60Migration:risky' => true
+ '@PHP71Migration' => true,
+ '@PHP71Migration:risky' => true,
+ '@PHPUnit84Migration:risky' => true,
+ // Causes too much problems for now, fix later
+ 'declare_strict_types' => false,
  ])
  ->setFinder(
  PhpCsFixer\Finder::create()

composer.json

@@ -22,7 +22,7 @@
  "symfony/event-dispatcher": "^2.4|^3.0|^4.0|^5.0"
  },
  "require-dev": {
- "phpunit/phpunit": "^7.4.3",
+ "phpunit/phpunit": "^8.4.0",
  "mikey179/vfsstream": "^1.6",
  "phpstan/phpstan": "^0.12",
  "phpstan/phpstan-beberlei-assert": "^0.12.0",

docker-compose.yaml

@@ -0,0 +1,12 @@
+version: "3.8"
+services:
+ workspace:
+ tty: true
+ build:
+ context: resources/docker/workspace
+ args:
+ PUID: "${PUID:-1000}"
+ PGID: "${PGID:-1000}"
+ volumes:
+ - .:/var/www/html
+ - ~/.composer:/home/user/.composer

resources/docker/workspace/Dockerfile

@@ -0,0 +1,35 @@
+FROM php:7.2-cli-alpine
+
+ARG PUID=1000
+ARG PGID=1000
+
+RUN apk add --no-cache --virtual .build-deps \
+ # for extensions
+ $PHPIZE_DEPS \
+ # for soap
+ libxml2-dev \
+ && \
+ apk add --no-cache \
+ bash \
+ # for soap
+ libxml2 \
+ # for composer
+ unzip \
+ && \
+ docker-php-ext-install soap \
+ && \
+ pecl install \
+ # pcov for coverage runs
+ pcov && docker-php-ext-enable pcov \
+ && \
+ apk del .build-deps
+
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+
+WORKDIR /var/www/html
+
+# Add a non-root user to prevent files being created with root permissions on host machine.
+RUN addgroup -g ${PGID} user && \
+ adduser -u ${PUID} -G user -D user
+
+USER user

src/VCR/CodeTransform/AbstractCodeTransform.php

@@ -10,7 +10,7 @@
  */
 abstract class AbstractCodeTransform extends \php_user_filter
 {
- const NAME = 'vcr_abstract_filter';
+ public const NAME = 'vcr_abstract_filter';
 
  /**
  * Attaches the current filter to a stream.
@@ -43,7 +43,7 @@ public function filter($in, $out, &$consumed, $closing)
  stream_bucket_append($out, $bucket);
  }
 
- return PSFS_PASS_ON;
+ return \PSFS_PASS_ON;
  }
 
  /**

src/VCR/CodeTransform/CurlCodeTransform.php

@@ -6,7 +6,7 @@
 
 class CurlCodeTransform extends AbstractCodeTransform
 {
- const NAME = 'vcr_curl';
+ public const NAME = 'vcr_curl';
 
  /**
  * @var array<string, string>

src/VCR/CodeTransform/SoapCodeTransform.php

@@ -6,7 +6,7 @@
 
 class SoapCodeTransform extends AbstractCodeTransform
 {
- const NAME = 'vcr_soap';
+ public const NAME = 'vcr_soap';
 
  /**
  * @var string[]

src/VCR/LibraryHooks/CurlHook.php

@@ -281,7 +281,7 @@ public static function curlMultiExec($multiHandle, ?int &$stillRunning): int
  }
  }
 
- return CURLM_OK;
+ return \CURLM_OK;
  }
 
  /**
@@ -295,9 +295,9 @@ public static function curlMultiInfoRead()
  {
  if (!empty(self::$multiExecLastChs)) {
  $info = [
- 'msg' => CURLMSG_DONE,
+ 'msg' => \CURLMSG_DONE,
  'handle' => array_pop(self::$multiExecLastChs),
- 'result' => CURLE_OK,
+ 'result' => \CURLE_OK,
  ];
 
  return $info;

src/VCR/LibraryHooks/LibraryHook.php

@@ -10,12 +10,12 @@ interface LibraryHook
  /**
  * @var string enabled status for a hook
  */
- const ENABLED = 'ENABLED';
+ public const ENABLED = 'ENABLED';
 
  /**
  * @var string disabled status for a hook
  */
- const DISABLED = 'DISABLED';
+ public const DISABLED = 'DISABLED';
 
  /**
  * Enables library hook which means that all of this library