Merge pull request #120 from rvanlaak/phpunit-deprecation

rvanlaak · Jun 23, 2021 · 2eb5147 · 2eb5147
2 parents 58992db + 37d5d67
commit 2eb5147
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 28 deletions.
diff --git a/Tests/CachedSettingsManagerTest.php b/Tests/CachedSettingsManagerTest.php
@@ -117,13 +117,13 @@ public function testSet()
         $cachedSettingsManager->expects($this->at(0))
             ->method('invalidateCache')
             ->with($this->equalTo($name), $this->equalTo($owner))
-            ->willReturn(null);
+            ->willReturn(true);
 
         // Clear all cache for this owner
         $cachedSettingsManager->expects($this->at(1))
             ->method('invalidateCache')
             ->with($this->equalTo(null), $this->equalTo($owner))
-            ->willReturn(null);
+            ->willReturn(true);
 
         $cachedSettingsManager->set($name, $value, $owner);
     }
@@ -162,11 +162,11 @@ public function testClear()
         $cachedSettingsManager->expects($this->at(0))
             ->method('invalidateCache')
             ->with($this->equalTo($name), $this->equalTo($owner))
-            ->willReturn(null);
+            ->willReturn(true);
         $cachedSettingsManager->expects($this->at(1))
             ->method('invalidateCache')
             ->with($this->equalTo(null), $this->equalTo($owner))
-            ->willReturn(null);
+            ->willReturn(true);
 
         $cachedSettingsManager->clear($name, $owner);
     }

diff --git a/Tests/SerializerTest.php b/Tests/SerializerTest.php
@@ -28,11 +28,9 @@ public function testCustomSerializer()
         $this->assertEquals(self::$testData, $serializer->unserialize($serializer->serialize(self::$testData)));
     }
 
-    /**
-     * @expectedException \Dmishh\SettingsBundle\Exception\UnknownSerializerException
-     */
     public function testUnknownSerializer()
     {
+        $this->expectException('\Dmishh\SettingsBundle\Exception\UnknownSerializerException');
         $serializer = SerializerFactory::create('unknown_serializer');
     }
 }
diff --git a/Tests/SettingsManagerTest.php b/Tests/SettingsManagerTest.php
@@ -9,11 +9,9 @@
 
 class SettingsManagerTest extends AbstractTest
 {
-    /**
-     * @expectedException \Dmishh\SettingsBundle\Exception\UnknownSettingException
-     */
     public function testGetUnknownSettingShouldRaiseException()
     {
+        $this->expectException('\Dmishh\SettingsBundle\Exception\UnknownSettingException');
         $settingsManager = $this->createSettingsManager();
         $settingsManager->get('unknown_setting');
     }
@@ -98,11 +96,10 @@ public function testPersistence()
         $this->assertNull($settingsManager->get('some_setting'));
     }
 
-    /**
-     * @expectedException \Dmishh\SettingsBundle\Exception\WrongScopeException
-     */
     public function testSetUserSettingInGlobalScopeRaisesException()
     {
+        $this->expectException('\Dmishh\SettingsBundle\Exception\WrongScopeException');
+
         $owner = $this->createOwner();
         $settingsManager = $this->createSettingsManager();
         $settingsManager->set('some_global_setting', 'VALUE_GLOBAL');
@@ -111,21 +108,19 @@ public function testSetUserSettingInGlobalScopeRaisesException()
         $settingsManager->set('some_global_setting', 'VALUE_GLOBAL', $owner);
     }
 
-    /**
-     * @expectedException \Dmishh\SettingsBundle\Exception\WrongScopeException
-     */
     public function testGetUserSettingInGlobalScopeRaisesException()
     {
+        $this->expectException('\Dmishh\SettingsBundle\Exception\WrongScopeException');
+
         $owner = $this->createOwner();
         $settingsManager = $this->createSettingsManager();
         $settingsManager->get('some_global_setting', $owner);
     }
 
-    /**
-     * @expectedException \Dmishh\SettingsBundle\Exception\WrongScopeException
-     */
     public function testSetGlobalSettingInUserScopeRaisesException()
     {
+        $this->expectException('\Dmishh\SettingsBundle\Exception\WrongScopeException');
+
         $owner = $this->createOwner();
         $settingsManager = $this->createSettingsManager();
         $settingsManager->set('some_user_setting', 'VALUE_USER', $owner);
@@ -134,11 +129,10 @@ public function testSetGlobalSettingInUserScopeRaisesException()
         $settingsManager->set('some_user_setting', 'VALUE_USER');
     }
 
-    /**
-     * @expectedException \Dmishh\SettingsBundle\Exception\WrongScopeException
-     */
     public function testGetGlobalSettingInUserScopeRaisesException()
     {
+        $this->expectException('\Dmishh\SettingsBundle\Exception\WrongScopeException');
+
         $settingsManager = $this->createSettingsManager();
         $settingsManager->get('some_user_setting');
     }
@@ -207,20 +201,18 @@ public function testValidSerizalizationTypes()
         $this->assertEquals(123, $settingsManager->get('some_setting'));
     }
 
-    /**
-     * @expectedException \Dmishh\SettingsBundle\Exception\SettingsException
-     */
     public function testSetSettingWithInvalidSerizalizationType()
     {
+        $this->expectException('\Dmishh\SettingsBundle\Exception\SettingsException');
+
         $settingsManager = $this->createSettingsManager([], 'unknown_serialization_type');
         $settingsManager->set('some_setting', 123);
     }
 
-    /**
-     * @expectedException \Dmishh\SettingsBundle\Exception\SettingsException
-     */
     public function testGetSettingWithInvalidSerizalizationType()
     {
+        $this->expectException('\Dmishh\SettingsBundle\Exception\SettingsException');
+
         $settingsManager = $this->createSettingsManager([]);
         $settingsManager->set('some_setting', 123);