Updated mixed type with appropriate types

mautic · Jun 19, 2023 · 22689f7 · 22689f7
1 parent e5f5bd6
commit 22689f7
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 40 deletions.
diff --git a/app/bundles/CampaignBundle/Entity/Campaign.php b/app/bundles/CampaignBundle/Entity/Campaign.php
@@ -204,11 +204,7 @@ public function convertToArray()
         return get_object_vars($this);
     }
 
-    /**
-     * @param string $prop
-     * @param mixed  $val
-     */
-    protected function isChanged($prop, $val)
+    protected function isChanged(string $prop, float|bool|int|string|null $val): void
     {
         $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();

diff --git a/app/bundles/CoreBundle/Entity/CommonEntity.php b/app/bundles/CoreBundle/Entity/CommonEntity.php
@@ -56,11 +56,7 @@ public function __toString()
         return $string;
     }
 
-    /**
-     * @param string $prop
-     * @param mixed  $val
-     */
-    protected function isChanged($prop, $val)
+    protected function isChanged(string $prop, float|bool|int|string|null $val): void
     {
         $getter  = (method_exists($this, $prop)) ? $prop : 'get'.ucfirst($prop);
         $current = $this->$getter();

diff --git a/app/bundles/DynamicContentBundle/Entity/DynamicContent.php b/app/bundles/DynamicContentBundle/Entity/DynamicContent.php
@@ -249,7 +249,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
             ->build();
     }
 
-    protected function isChanged($prop, $val)
+    protected function isChanged(string $prop, float|bool|int|string|null $val): void
     {
         $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();

diff --git a/app/bundles/EmailBundle/Entity/Email.php b/app/bundles/EmailBundle/Entity/Email.php
@@ -461,7 +461,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
             ->build();
     }
 
-    protected function isChanged($prop, $val)
+    protected function isChanged(string $prop, float|bool|int|string|null $val): void
     {
         $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();

diff --git a/app/bundles/FormBundle/Entity/Form.php b/app/bundles/FormBundle/Entity/Form.php
@@ -311,7 +311,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
             ->build();
     }
 
-    protected function isChanged($prop, $val)
+    protected function isChanged(string $prop, float|bool|int|string|null $val): void
     {
         if ('actions' == $prop || 'fields' == $prop) {
             // changes are already computed so just add them

diff --git a/app/bundles/LeadBundle/Entity/Company.php b/app/bundles/LeadBundle/Entity/Company.php
@@ -181,11 +181,7 @@ public static function getDefaultIdentifierFields(): array
         ];
     }
 
-    /**
-     * @param string $prop
-     * @param mixed  $val
-     */
-    protected function isChanged($prop, $val)
+    protected function isChanged(string $prop, float|bool|int|string|null $val): void
     {
         $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();

diff --git a/app/bundles/LeadBundle/Entity/Lead.php b/app/bundles/LeadBundle/Entity/Lead.php
@@ -470,12 +470,7 @@ public static function getDefaultIdentifierFields(): array
         ];
     }
 
-    /**
-     * @param string $prop
-     * @param mixed  $val
-     * @param null   $oldValue
-     */
-    protected function isChanged($prop, $val, $oldValue = null)
+    protected function isChanged(string $prop, float|bool|int|string|null $val): void
     {
         $getter  = 'get'.ucfirst($prop);
         $current = null !== $oldValue ? $oldValue : $this->$getter();

diff --git a/app/bundles/NotificationBundle/Entity/Notification.php b/app/bundles/NotificationBundle/Entity/Notification.php
@@ -283,7 +283,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
             ->build();
     }
 
-    protected function isChanged($prop, $val)
+    protected function isChanged(string $prop, float|bool|int|string|null $val): void
     {
         $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();

diff --git a/app/bundles/PageBundle/Entity/Page.php b/app/bundles/PageBundle/Entity/Page.php
@@ -742,7 +742,7 @@ public function getTemplate()
         return $this->template;
     }
 
-    protected function isChanged($prop, $val)
+    protected function isChanged(string $prop, float|bool|int|string|null $val): void
     {
         $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();

diff --git a/app/bundles/PointBundle/Entity/Trigger.php b/app/bundles/PointBundle/Entity/Trigger.php
@@ -143,11 +143,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
             ->build();
     }
 
-    /**
-     * @param string $prop
-     * @param mixed  $val
-     */
-    protected function isChanged($prop, $val)
+    protected function isChanged(string $prop, float|bool|int|string|null $val): void
     {
         if ('events' == $prop) {
             // changes are already computed so just add them

diff --git a/app/bundles/SmsBundle/Entity/Sms.php b/app/bundles/SmsBundle/Entity/Sms.php
@@ -217,7 +217,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
             ->build();
     }
 
-    protected function isChanged($prop, $val)
+    protected function isChanged(string $prop, float|bool|int|string|null $val): void
     {
         $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();

diff --git a/app/bundles/UserBundle/Entity/User.php b/app/bundles/UserBundle/Entity/User.php
@@ -297,10 +297,7 @@ public static function loadApiMetadata(ApiMetadataDriver $metadata)
             ->build();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    protected function isChanged($prop, $val)
+    protected function isChanged(string $prop, float|bool|int|string|null $val): void
     {
         $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();

diff --git a/app/bundles/WebhookBundle/Entity/Webhook.php b/app/bundles/WebhookBundle/Entity/Webhook.php
@@ -514,10 +514,7 @@ public function wasModifiedRecently()
         return true;
     }
 
-    /**
-     * @param string $prop
-     */
-    protected function isChanged($prop, $val)
+    protected function isChanged(string $prop, float|bool|int|string|null $val): void
     {
         $getter  = 'get'.ucfirst($prop);
         $current = $this->$getter();