Merge remote-tracking branch 'upstream/develop' into 4.4

psalm-baseline.xml

@@ -172,6 +172,11 @@
       <code>UnexsistenceClass</code>
     </UndefinedClass>
   </file>
+  <file src="tests/system/Config/BaseConfigTest.php">
+    <UndefinedClass occurrences="1">
+        <code>SimpleConfig</code>
+    </UndefinedClass>
+  </file>
   <file src="tests/system/Config/FactoriesTest.php">
     <UndefinedClass occurrences="1">
       <code>'SomeWidget'</code>

rector.php

@@ -40,6 +40,7 @@
 use Rector\Php71\Rector\FuncCall\CountOnNullRector;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php73\Rector\FuncCall\StringifyStrNeedlesRector;
+use Rector\PHPUnit\Rector\MethodCall\AssertPropertyExistsRector;
 use Rector\PHPUnit\Rector\MethodCall\GetMockBuilderGetMockToCreateMockRector;
 use Rector\PHPUnit\Set\PHPUnitSetList;
 use Rector\Privatization\Rector\Property\PrivatizeFinalClassPropertyRector;
@@ -80,6 +81,8 @@
         __DIR__ . '/tests/_support',
         JsonThrowOnErrorRector::class,
         StringifyStrNeedlesRector::class,
+        // assertObjectHasAttribute() is deprecated
+        AssertPropertyExistsRector::class,
 
         RemoveUnusedPrivateMethodRector::class => [
             // private method called via getPrivateMethodInvoker

tests/system/Commands/BaseCommandTest.php

@@ -35,14 +35,14 @@ public function testMagicIssetTrue()
     {
         $command = new AppInfo($this->logger, service('commands'));
 
-        $this->assertObjectHasAttribute('group', $command);
+        $this->assertTrue(isset($command->group));
     }
 
     public function testMagicIssetFalse()
     {
         $command = new AppInfo($this->logger, service('commands'));
 
-        $this->assertObjectNotHasAttribute('foobar', $command);
+        $this->assertFalse(isset($command->foobar));
     }
 
     public function testMagicGet()

tests/system/Config/BaseConfigTest.php

@@ -110,7 +110,7 @@ public function testEnvironmentOverrides()
         // override config with shortPrefix ENV var
         $this->assertSame('hubbahubba', $config->delta);
         // incorrect env name should not inject property
-        $this->assertObjectNotHasAttribute('notthere', $config);
+        $this->assertFalse(property_exists($config, 'notthere'));
         // empty ENV var should not affect config setting
         $this->assertSame('pineapple', $config->fruit);
         // non-empty ENV var should overrideconfig setting

tests/system/Entity/EntityTest.php

@@ -96,7 +96,7 @@ public function testFill()
 
         $this->assertSame(123, $entity->foo);
         $this->assertSame('bar:234:bar', $entity->bar);
-        $this->assertObjectNotHasAttribute('baz', $entity);
+        $this->assertSame(4556, $entity->baz);
     }
 
     /**

tests/system/Log/Handlers/ChromeLoggerHandlerTest.php

@@ -66,10 +66,11 @@ public function testSetDateFormat()
         $config->handlers['CodeIgniter\Log\Handlers\TestHandler']['handles'] = ['critical'];
 
         $logger = new ChromeLoggerHandler($config->handlers['CodeIgniter\Log\Handlers\TestHandler']);
+
         $result = $logger->setDateFormat('F j, Y');
 
-        $this->assertObjectHasAttribute('dateFormat', $result);
-        $this->assertObjectHasAttribute('dateFormat', $logger);
+        $this->assertSame('F j, Y', $this->getPrivateProperty($result, 'dateFormat'));
+        $this->assertSame('F j, Y', $this->getPrivateProperty($logger, 'dateFormat'));
     }
 
     public function testChromeLoggerHeaderSent()

tests/system/Test/FabricatorTest.php

@@ -406,7 +406,7 @@ public function testCreateMockSetsDatabaseFields()
         $this->assertIsInt($result->created_at);
         $this->assertIsInt($result->updated_at);
 
-        $this->assertObjectHasAttribute('deleted_at', $result);
+        $this->assertTrue(property_exists($result, 'deleted_at'));
         $this->assertNull($result->deleted_at);
     }