Updated php-cs-fixer config

Author: JeroenVanOort

.php_cs.dist

@@ -2,10 +2,14 @@
 
 return PhpCsFixer\Config::create()
  ->setRules([
- '@PSR2' => true,
+ '@PSR12' => true,
  '@Symfony' => true,
  '@Symfony:risky' => true,
- '@PHPUnit84Migration: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()

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.

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/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

src/VCR/Request.php

@@ -107,7 +107,7 @@ public static function fromArray(array $request): self
  $requestObject = new self(
  $request['method'],
  $request['url'],
- isset($request['headers']) ? $request['headers'] : []
+ $request['headers'] ?? []
  );
 
  if (!empty($request['post_fields']) && \is_array($request['post_fields'])) {

src/VCR/Response.php

@@ -82,7 +82,7 @@ public function toArray(): array
  */
  public static function fromArray(array $response): self
  {
- $body = isset($response['body']) ? $response['body'] : null;
+ $body = $response['body'] ?? null;
 
  $gzip = isset($response['headers']['Content-Type'])
  && false !== strpos($response['headers']['Content-Type'], 'application/x-gzip');
@@ -96,10 +96,10 @@ public static function fromArray(array $response): self
  }
 
  return new static(
- isset($response['status']) ? $response['status'] : 200,
- isset($response['headers']) ? $response['headers'] : [],
+ $response['status'] ?? 200,
+ $response['headers'] ?? [],
  $body,
- isset($response['curl_info']) ? $response['curl_info'] : []
+ $response['curl_info'] ?? []
  );
  }
 

src/VCR/Storage/Json.php

@@ -78,10 +78,8 @@ protected function readNextRecord(): string
 
  /**
  * Resets the storage to the beginning.
- *
- * @return void
  */
- public function rewind()
+ public function rewind(): void
  {
  rewind($this->handle);
  $this->isEOF = false;

src/VCR/Storage/Yaml.php

@@ -51,10 +51,8 @@ public function storeRecording(array $recording): void
 
  /**
  * Parses the next record.
- *
- * @return void
  */
- public function next()
+ public function next(): void
  {
  $recording = $this->yamlParser->parse($this->readNextRecord());
  $this->current = $recording[0] ?? null;
@@ -101,10 +99,8 @@ private function readNextRecord(): string
 
  /**
  * Resets the storage to the beginning.
- *
- * @return void
  */
- public function rewind()
+ public function rewind(): void
  {
  rewind($this->handle);
  $this->isEOF = false;

src/VCR/Util/Assertion.php

@@ -9,7 +9,7 @@ class Assertion extends BaseAssertion
 {
  protected static $exceptionClass = 'VCR\VCRException';
 
- const INVALID_CALLABLE = 910;
+ public const INVALID_CALLABLE = 910;
 
  /**
  * Assert that the value is callable.