Prepare update to phpunit 9

Remove some deprecated phpunit assertions that test non public attribute Signed-off-by: codisart <louis.celier@gmail.com>
laminas · May 9, 2020 · debf38c · debf38c
1 parent 3f5e678
commit debf38c
Show file tree

Hide file tree

Showing 25 changed files with 269 additions and 164 deletions.
diff --git a/test/BarcodeTest.php b/test/BarcodeTest.php
@@ -487,20 +487,26 @@ public function testEan13ContainsOnlyNumeric()
     public function testEqualsMessageTemplates()
     {
         $validator = new Barcode('code25');
-        $this->assertAttributeEquals(
-            $validator->getOption('messageTemplates'),
-            'messageTemplates',
-            $validator
+
+        self::assertSame(
+            [
+                Barcode::FAILED,
+                Barcode::INVALID_CHARS,
+                Barcode::INVALID_LENGTH,
+                Barcode::INVALID,
+            ],
+            array_keys($validator->getMessageTemplates())
         );
     }
 
     public function testEqualsMessageVariables()
     {
         $validator = new Barcode('code25');
-        $this->assertAttributeEquals(
-            $validator->getOption('messageVariables'),
-            'messageVariables',
-            $validator
-        );
+
+        $messageVariables = [
+            'length' => ['options' => 'length'],
+        ];
+
+        self::assertSame($messageVariables, $validator->getOption('messageVariables'));
     }
 }
diff --git a/test/BetweenTest.php b/test/BetweenTest.php
@@ -238,13 +238,28 @@ public function testGetInclusive()
     public function testEqualsMessageTemplates()
     {
         $validator = new Between(['min' => 1, 'max' => 10]);
-        $this->assertAttributeEquals($validator->getOption('messageTemplates'), 'messageTemplates', $validator);
+
+        self::assertSame(
+            [
+                Between::NOT_BETWEEN,
+                Between::NOT_BETWEEN_STRICT,
+                Between::VALUE_NOT_NUMERIC,
+                Between::VALUE_NOT_STRING,
+            ],
+            array_keys($validator->getMessageTemplates())
+        );
     }
 
     public function testEqualsMessageVariables()
     {
         $validator = new Between(['min' => 1, 'max' => 10]);
-        $this->assertAttributeEquals($validator->getOption('messageVariables'), 'messageVariables', $validator);
+
+        $messageVariables = [
+            'min' => ['options' => 'min'],
+            'max' => ['options' => 'max'],
+        ];
+
+        $this->assertSame($messageVariables, $validator->getOption('messageVariables'));
     }
 
     /**

diff --git a/test/CallbackTest.php b/test/CallbackTest.php
@@ -77,10 +77,13 @@ public function testAddingValueOptions()
     public function testEqualsMessageTemplates()
     {
         $validator = new Callback([$this, 'objectCallback']);
-        $this->assertAttributeEquals(
-            $validator->getOption('messageTemplates'),
-            'messageTemplates',
-            $validator
+
+        self::assertSame(
+            [
+                Callback::INVALID_VALUE,
+                Callback::INVALID_CALLBACK,
+            ],
+            array_keys($validator->getMessageTemplates())
         );
     }
 

diff --git a/test/CreditCardTest.php b/test/CreditCardTest.php
@@ -362,10 +362,18 @@ public function testMultiInstitute()
     public function testEqualsMessageTemplates()
     {
         $validator = new CreditCard();
-        $this->assertAttributeEquals(
-            $validator->getOption('messageTemplates'),
-            'messageTemplates',
-            $validator
+
+        self::assertSame(
+            [
+                CreditCard::CHECKSUM,
+                CreditCard::CONTENT,
+                CreditCard::INVALID,
+                CreditCard::LENGTH,
+                CreditCard::PREFIX,
+                CreditCard::SERVICE,
+                CreditCard::SERVICEFAILURE,
+            ],
+            array_keys($validator->getMessageTemplates())
         );
     }
 

diff --git a/test/DateStepTest.php b/test/DateStepTest.php
@@ -109,8 +109,16 @@ public function testGetMessagesReturnsDefaultValue()
     public function testEqualsMessageTemplates()
     {
         $validator  = new Validator\DateStep([]);
-        $this->assertObjectHasAttribute('messageTemplates', $validator);
-        $this->assertAttributeEquals($validator->getOption('messageTemplates'), 'messageTemplates', $validator);
+
+        self::assertSame(
+            [
+                Validator\DateStep::INVALID,
+                Validator\DateStep::INVALID_DATE,
+                Validator\DateStep::FALSEFORMAT,
+                Validator\DateStep::NOT_STEP,
+            ],
+            array_keys($validator->getMessageTemplates())
+        );
     }
 
     public function testStepError()

diff --git a/test/DateTest.php b/test/DateTest.php
@@ -159,22 +159,23 @@ public function testUseManualFormat()
 
     public function testEqualsMessageTemplates()
     {
-        $validator = $this->validator;
-        $this->assertAttributeEquals(
-            $validator->getOption('messageTemplates'),
-            'messageTemplates',
-            $validator
+        self::assertSame(
+            [
+                Validator\Date::INVALID,
+                Validator\Date::INVALID_DATE,
+                Validator\Date::FALSEFORMAT,
+            ],
+            array_keys($this->validator->getMessageTemplates())
         );
     }
 
     public function testEqualsMessageVariables()
     {
-        $validator = $this->validator;
-        $this->assertAttributeEquals(
-            $validator->getOption('messageVariables'),
-            'messageVariables',
-            $validator
-        );
+        $messageVariables = [
+            'format' => 'format',
+        ];
+
+        self::assertSame($messageVariables, $this->validator->getOption('messageVariables'));
     }
 
     public function testConstructorWithFormatParameter()

diff --git a/test/Db/NoRecordExistsTest.php b/test/Db/NoRecordExistsTest.php
@@ -228,10 +228,12 @@ public function testWithSchemaNoResult()
     public function testEqualsMessageTemplates()
     {
         $validator  = new NoRecordExists('users', 'field1');
-        $this->assertAttributeEquals(
-            $validator->getOption('messageTemplates'),
-            'messageTemplates',
-            $validator
-        );
+
+        $messageTemplates = [
+            'noRecordFound' => 'No record matching the input was found',
+            'recordFound' => 'A record matching the input was found',
+        ];
+
+        $this->assertSame($messageTemplates, $validator->getOption('messageTemplates'));
     }
 }
diff --git a/test/Db/RecordExistsTest.php b/test/Db/RecordExistsTest.php
@@ -275,11 +275,13 @@ public function testSelectAcknowledgesTableAndSchema()
     public function testEqualsMessageTemplates()
     {
         $validator  = new RecordExists('users', 'field1');
-        $this->assertAttributeEquals(
-            $validator->getOption('messageTemplates'),
-            'messageTemplates',
-            $validator
-        );
+
+        $messageTemplates = [
+            'noRecordFound' => 'No record matching the input was found',
+            'recordFound' => 'A record matching the input was found',
+        ];
+
+        $this->assertSame($messageTemplates, $validator->getOption('messageTemplates'));
     }
 
     /**

diff --git a/test/DigitsTest.php b/test/DigitsTest.php
@@ -95,11 +95,13 @@ public function testNonStringValidation()
 
     public function testEqualsMessageTemplates()
     {
-        $validator = $this->validator;
-        $this->assertAttributeEquals(
-            $validator->getOption('messageTemplates'),
-            'messageTemplates',
-            $validator
+        self::assertSame(
+            [
+                Digits::NOT_DIGITS,
+                Digits::STRING_EMPTY,
+                Digits::INVALID,
+            ],
+            array_keys($this->validator->getMessageTemplates())
         );
     }
 }
diff --git a/test/EmailAddressTest.php b/test/EmailAddressTest.php
@@ -344,7 +344,7 @@ public function testNonStrict()
         }
     }
 
-   /**
+    /**
      * Ensures that the validator follows expected behavior for checking MX records
      *
      * @return void
@@ -414,7 +414,7 @@ public function testNoMxRecordARecordFallback()
         $this->assertTrue($validator->isValid($email), implode("\n", $validator->getMessages()));
     }
 
-   /**
+    /**
      * Test changing hostname settings via EmailAddress object
      *
      * @return void
@@ -718,22 +718,30 @@ public function testGetMXRecord()
 
     public function testEqualsMessageTemplates()
     {
-        $validator = $this->validator;
-        $this->assertAttributeEquals(
-            $validator->getOption('messageTemplates'),
-            'messageTemplates',
-            $validator
+        self::assertSame(
+            [
+                EmailAddress::INVALID,
+                EmailAddress::INVALID_FORMAT,
+                EmailAddress::INVALID_HOSTNAME,
+                EmailAddress::INVALID_MX_RECORD,
+                EmailAddress::INVALID_SEGMENT,
+                EmailAddress::DOT_ATOM,
+                EmailAddress::QUOTED_STRING,
+                EmailAddress::INVALID_LOCAL_PART,
+                EmailAddress::LENGTH_EXCEEDED,
+            ],
+            array_keys($this->validator->getMessageTemplates())
         );
     }
 
     public function testEqualsMessageVariables()
     {
-        $validator = $this->validator;
-        $this->assertAttributeEquals(
-            $validator->getOption('messageVariables'),
-            'messageVariables',
-            $validator
-        );
+        $messageVariables = [
+            'hostname'  => 'hostname',
+            'localPart' => 'localPart'
+        ];
+
+        self::assertSame($messageVariables, $this->validator->getOption('messageVariables'));
     }
 
     /**

diff --git a/test/ExplodeTest.php b/test/ExplodeTest.php
@@ -93,21 +93,20 @@ public function testGetMessagesReturnsDefaultValue()
     public function testEqualsMessageTemplates()
     {
         $validator = new Explode([]);
-        $this->assertAttributeEquals(
-            $validator->getOption('messageTemplates'),
-            'messageTemplates',
-            $validator
+
+        self::assertSame(
+            [
+                Explode::INVALID
+            ],
+            array_keys($validator->getMessageTemplates())
         );
     }
 
     public function testEqualsMessageVariables()
     {
         $validator = new Explode([]);
-        $this->assertAttributeEquals(
-            $validator->getOption('messageVariables'),
-            'messageVariables',
-            $validator
-        );
+
+        self::assertSame([], $validator->getOption('messageVariables'));
     }
 
     public function testSetValidatorAsArray()

diff --git a/test/GreaterThanTest.php b/test/GreaterThanTest.php
@@ -84,21 +84,25 @@ public function testGetInclusive()
     public function testEqualsMessageTemplates()
     {
         $validator = new GreaterThan(1);
-        $this->assertAttributeEquals(
-            $validator->getOption('messageTemplates'),
-            'messageTemplates',
-            $validator
+
+        self::assertSame(
+            [
+                GreaterThan::NOT_GREATER,
+                GreaterThan::NOT_GREATER_INCLUSIVE
+            ],
+            array_keys($validator->getMessageTemplates())
         );
     }
 
     public function testEqualsMessageVariables()
     {
         $validator = new GreaterThan(1);
-        $this->assertAttributeEquals(
-            $validator->getOption('messageVariables'),
-            'messageVariables',
-            $validator
-        );
+
+        $messageVariables = [
+            'min' => 'min'
+        ];
+
+        self::assertSame($messageVariables, $validator->getOption('messageVariables'));
     }
 
     public function testCorrectInclusiveMessageReturn()

diff --git a/test/HexTest.php b/test/HexTest.php
@@ -70,11 +70,12 @@ public function testNonStringValidation()
 
     public function testEqualsMessageTemplates()
     {
-        $validator = $this->validator;
-        $this->assertAttributeEquals(
-            $validator->getOption('messageTemplates'),
-            'messageTemplates',
-            $validator
+        self::assertSame(
+            [
+                Hex::INVALID,
+                Hex::NOT_HEX,
+            ],
+            array_keys($this->validator->getMessageTemplates())
         );
     }
 }
diff --git a/test/HostnameTest.php b/test/HostnameTest.php
@@ -693,14 +693,31 @@ public function testIDNIT()
 
     public function testEqualsMessageTemplates()
     {
-        $validator = $this->validator;
-        $this->assertAttributeEquals($validator->getOption('messageTemplates'), 'messageTemplates', $validator);
+        self::assertSame(
+            [
+                Hostname::CANNOT_DECODE_PUNYCODE,
+                Hostname::INVALID,
+                Hostname::INVALID_DASH,
+                Hostname::INVALID_HOSTNAME,
+                Hostname::INVALID_HOSTNAME_SCHEMA,
+                Hostname::INVALID_LOCAL_NAME,
+                Hostname::INVALID_URI,
+                Hostname::IP_ADDRESS_NOT_ALLOWED,
+                Hostname::LOCAL_NAME_NOT_ALLOWED,
+                Hostname::UNDECIPHERABLE_TLD,
+                Hostname::UNKNOWN_TLD,
+            ],
+            array_keys($this->validator->getMessageTemplates())
+        );
     }
 
     public function testEqualsMessageVariables()
     {
-        $validator = $this->validator;
-        $this->assertAttributeEquals($validator->getOption('messageVariables'), 'messageVariables', $validator);
+        $messageVariables = [
+            'tld' => 'tld',
+        ];
+
+        self::assertSame($messageVariables, $this->validator->getOption('messageVariables'));
     }
 
     public function testHostnameWithOnlyIpChars()