Fix all phpcs issues

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
- - 7.2
  - 7.3
  - 7.4
  - 8.0
@@ -13,7 +12,7 @@ install: travis_retry composer install --prefer-source
 script: composer ci
 
 after_success:
- - if [[ "`phpenv version-name`" != "7.4" ]]; then exit 0; fi
+ - if [[ "`phpenv version-name`" != "8.0" ]]; then exit 0; fi
  - vendor/bin/phpunit --coverage-clover coverage.clover
  - wget https://scrutinizer-ci.com/ocular.phar
  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover

composer.json

@@ -24,7 +24,7 @@
  "irc": "irc:https://irc.freenode.net/wikimedia-de-tech"
  },
  "require": {
- "php": ">=7.2"
+ "php": ">=7.3"
  },
  "require-dev": {
  "phpunit/phpunit": "~8.5.0",

src/ArrayComparer/ArrayComparer.php → src/ArrayComparer/ArrayComparerInterface.php

@@ -13,7 +13,7 @@
  * @license BSD-3-Clause
  * @author Jeroen De Dauw < [email protected] >
  */
-interface ArrayComparer {
+interface ArrayComparerInterface {
 
  /**
  * Returns an array containing all the entries from arrayOne that are not present in arrayTwo.

src/ArrayComparer/NativeArrayComparer.php

@@ -12,10 +12,10 @@
  * @license BSD-3-Clause
  * @author Jeroen De Dauw < [email protected] >
  */
-class NativeArrayComparer implements ArrayComparer {
+class NativeArrayComparer implements ArrayComparerInterface {
 
  /**
- * @see ArrayComparer::diffArrays
+ * @see ArrayComparerInterface::diffArrays
  *
  * Uses @see array_diff.
  *

src/ArrayComparer/OrderedArrayComparer.php

@@ -4,7 +4,7 @@
 
 namespace Diff\ArrayComparer;
 
-use Diff\Comparer\ValueComparer;
+use Diff\Comparer\ValueComparerInterface;
 
 /**
  * Computes the difference between two ordered arrays by comparing elements with
@@ -19,16 +19,16 @@
  * @author Jeroen De Dauw < [email protected] >
  * @author Tobias Gritschacher < [email protected] >
  */
-class OrderedArrayComparer implements ArrayComparer {
+class OrderedArrayComparer implements ArrayComparerInterface {
 
  private $valueComparer;
 
- public function __construct( ValueComparer $valueComparer ) {
+ public function __construct( ValueComparerInterface $valueComparer ) {
  $this->valueComparer = $valueComparer;
  }
 
  /**
- * @see ArrayComparer::diffArrays
+ * @see ArrayComparerInterface::diffArrays
  *
  * @since 0.9
  *

src/ArrayComparer/StrategicArrayComparer.php

@@ -4,7 +4,7 @@
 
 namespace Diff\ArrayComparer;
 
-use Diff\Comparer\ValueComparer;
+use Diff\Comparer\ValueComparerInterface;
 
 /**
  * Computes the difference between two arrays by comparing elements with
@@ -17,16 +17,16 @@
  * @license BSD-3-Clause
  * @author Jeroen De Dauw < [email protected] >
  */
-class StrategicArrayComparer implements ArrayComparer {
+class StrategicArrayComparer implements ArrayComparerInterface {
 
  private $valueComparer;
 
- public function __construct( ValueComparer $valueComparer ) {
+ public function __construct( ValueComparerInterface $valueComparer ) {
  $this->valueComparer = $valueComparer;
  }
 
  /**
- * @see ArrayComparer::diffArrays
+ * @see ArrayComparerInterface::diffArrays
  *
  * @since 0.8
  *

src/ArrayComparer/StrictArrayComparer.php

@@ -20,10 +20,10 @@
  * @license BSD-3-Clause
  * @author Jeroen De Dauw < [email protected] >
  */
-class StrictArrayComparer implements ArrayComparer {
+class StrictArrayComparer implements ArrayComparerInterface {
 
  /**
- * @see ArrayComparer::diffArrays
+ * @see ArrayComparerInterface::diffArrays
  *
  * @since 0.8
  *

src/Comparer/CallbackComparer.php

@@ -13,7 +13,7 @@
  * @license BSD-3-Clause
  * @author Jeroen De Dauw < [email protected] >
  */
-class CallbackComparer implements ValueComparer {
+class CallbackComparer implements ValueComparerInterface {
 
  private $callback;
 

src/Comparer/ComparableComparer.php

@@ -12,7 +12,7 @@
  * @license BSD-3-Clause
  * @author Jeroen De Dauw < [email protected] >
  */
-class ComparableComparer implements ValueComparer {
+class ComparableComparer implements ValueComparerInterface {
 
  public function valuesAreEqual( $firstValue, $secondValue ): bool {
  if ( $firstValue && method_exists( $firstValue, 'equals' ) ) {

src/Comparer/StrictComparer.php

@@ -12,7 +12,7 @@
  * @license BSD-3-Clause
  * @author Jeroen De Dauw < [email protected] >
  */
-class StrictComparer implements ValueComparer {
+class StrictComparer implements ValueComparerInterface {
 
  /**
  * @param mixed $firstValue

src/Comparer/ValueComparer.php → src/Comparer/ValueComparerInterface.php

@@ -12,7 +12,7 @@
  * @license BSD-3-Clause
  * @author Jeroen De Dauw < [email protected] >
  */
-interface ValueComparer {
+interface ValueComparerInterface {
 
  /**
  * @since 0.6

src/DiffOp/AtomicDiffOp.php → src/DiffOp/AbstractAtomicDiffOp.php

@@ -14,7 +14,7 @@
  * @author Jeroen De Dauw < [email protected] >
  * @author Daniel Kinzler
  */
-abstract class AtomicDiffOp implements DiffOp {
+abstract class AbstractAtomicDiffOp implements DiffOpInterface {
 
  /**
  * @see Countable::count
@@ -28,7 +28,7 @@ public function count(): int {
  }
 
  /**
- * @see DiffOp::isAtomic
+ * @see DiffOpInterface::isAtomic
  *
  * @since 0.1
  *

src/DiffOp/Diff/Diff.php

@@ -5,7 +5,7 @@
 namespace Diff\DiffOp\Diff;
 
 use ArrayObject;
-use Diff\DiffOp\DiffOp;
+use Diff\DiffOp\DiffOpInterface;
 use Diff\DiffOp\DiffOpAdd;
 use Diff\DiffOp\DiffOpChange;
 use Diff\DiffOp\DiffOpRemove;
@@ -22,7 +22,7 @@
  * @author Daniel Kinzler
  * @author Thiemo Kreuz
  */
-class Diff extends ArrayObject implements DiffOp {
+class Diff extends ArrayObject implements DiffOpInterface {
 
  /**
  * @var bool|null
@@ -51,7 +51,7 @@ class Diff extends ArrayObject implements DiffOp {
  /**
  * @since 0.1
  *
- * @param DiffOp[] $operations
+ * @param DiffOpInterface[] $operations
  * @param bool|null $isAssociative
  *
  * @throws InvalidArgumentException
@@ -64,7 +64,7 @@ public function __construct( array $operations = [], $isAssociative = null ) {
  parent::__construct( [] );
 
  foreach ( $operations as $offset => $operation ) {
- if ( !( $operation instanceof DiffOp ) ) {
+ if ( !( $operation instanceof DiffOpInterface) ) {
  throw new InvalidArgumentException( 'All elements fed to the Diff constructor should be of type DiffOp' );
  }
 
@@ -77,7 +77,7 @@ public function __construct( array $operations = [], $isAssociative = null ) {
  /**
  * @since 0.1
  *
- * @return DiffOp[]
+ * @return DiffOpInterface[]
  */
  public function getOperations(): array {
  return $this->getArrayCopy();
@@ -88,7 +88,7 @@ public function getOperations(): array {
  *
  * @param string $type
  *
- * @return DiffOp[]
+ * @return DiffOpInterface[]
  */
  public function getTypeOperations( string $type ): array {
  return array_intersect_key(
@@ -100,7 +100,7 @@ public function getTypeOperations( string $type ): array {
  /**
  * @since 0.1
  *
- * @param DiffOp[] $operations
+ * @param DiffOpInterface[] $operations
  */
  public function addOperations( array $operations ) {
  foreach ( $operations as $operation ) {
@@ -118,12 +118,12 @@ public function addOperations( array $operations ) {
  * does not get added to the ArrayObject.
  *
  * @param int|string $index
- * @param DiffOp $value
+ * @param DiffOpInterface $value
  *
  * @return bool
  * @throws InvalidArgumentException
  */
- private function preSetElement( $index, DiffOp $value ): bool {
+ private function preSetElement( $index, DiffOpInterface $value ): bool {
  if ( $this->isAssociative === false && ( $value->getType() !== 'add' && $value->getType() !== 'remove' ) ) {
  throw new InvalidArgumentException( 'Diff operation with invalid type "' . $value->getType() . '" provided.' );
  }
@@ -219,7 +219,7 @@ function( DiffOpRemove $addition ) {
  }
 
  /**
- * @see DiffOp::isAtomic
+ * @see DiffOpInterface::isAtomic
  *
  * @since 0.1
  *
@@ -230,7 +230,7 @@ public function isAtomic(): bool {
  }
 
  /**
- * @see DiffOp::getType
+ * @see DiffOpInterface::getType
  *
  * @since 0.1
  *
@@ -256,7 +256,7 @@ public function count(): int {
  $count = 0;
 
  /**
- * @var DiffOp $diffOp
+ * @var DiffOpInterface $diffOp
  */
  foreach ( $this as $diffOp ) {
  $count += $diffOp->count();
@@ -318,7 +318,7 @@ public function hasAssociativeOperations(): bool {
  /**
  * Returns the Diff in array form where nested DiffOps are also turned into their array form.
  *
- * @see DiffOp::toArray
+ * @see DiffOpInterface::toArray
  *
  * @since 0.5
  *
@@ -414,7 +414,7 @@ public function offsetSet( $index, $value ) {
  * @throws InvalidArgumentException
  */
  private function setElement( $index, $value ) {
- if ( !( $value instanceof DiffOp ) ) {
+ if ( !( $value instanceof DiffOpInterface)) {
  throw new InvalidArgumentException(
  'Can only add DiffOp implementing objects to ' . get_called_class() . '.'
  );
@@ -455,7 +455,7 @@ public function serialize() {
  * @return bool
  */
  public function isEmpty(): bool {
- /** @var DiffOp $diffOp */
+ /** @var DiffOpInterface $diffOp */
  foreach ( $this as $diffOp ) {
  if ( $diffOp->count() > 0 ) {
  return false;

src/DiffOp/DiffOpAdd.php

@@ -13,12 +13,12 @@
  * @license BSD-3-Clause
  * @author Jeroen De Dauw < [email protected] >
  */
-class DiffOpAdd extends AtomicDiffOp {
+class DiffOpAdd extends AbstractAtomicDiffOp {
 
  private $newValue;
 
  /**
- * @see DiffOp::getType
+ * @see DiffOpInterface::getType
  *
  * @since 0.1
  *
@@ -69,7 +69,7 @@ public function unserialize( $serialization ) {
  }
 
  /**
- * @see DiffOp::toArray
+ * @see DiffOpInterface::toArray
  *
  * @since 0.5
  *

src/DiffOp/DiffOpChange.php

@@ -13,13 +13,13 @@
  * @license BSD-3-Clause
  * @author Jeroen De Dauw < [email protected] >
  */
-class DiffOpChange extends AtomicDiffOp {
+class DiffOpChange extends AbstractAtomicDiffOp {
 
  private $newValue;
  private $oldValue;
 
  /**
- * @see DiffOp::getType
+ * @see DiffOpInterface::getType
  *
  * @since 0.1
  *
@@ -81,7 +81,7 @@ public function unserialize( $serialization ) {
  }
 
  /**
- * @see DiffOp::toArray
+ * @see DiffOpInterface::toArray
  *
  * @since 0.5
  *

src/DiffOp/DiffOp.php → src/DiffOp/DiffOpInterface.php

@@ -18,7 +18,7 @@
  * @license BSD-3-Clause
  * @author Jeroen De Dauw < [email protected] >
  */
-interface DiffOp extends Serializable, Countable {
+interface DiffOpInterface extends Serializable, Countable {
 
  /**
  * Returns a string identifier for the operation type.