Merge pull request #757 from rob-3/issue/753-fix-deprecation-warnings

Issue/753 fix deprecation warnings
ucfopen · Feb 8, 2022 · bdf782d · bdf782d
2 parents 92d580b + 18e7bc3
commit bdf782d
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 30 deletions.
diff --git a/src/Entity/ContentItem.php b/src/Entity/ContentItem.php
@@ -88,9 +88,9 @@ public function __construct()
 
     /**
      * Serializes ContentItem into JSON.
-     * @return array|mixed
+     * @return array
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             'id' => $this->getId(),

diff --git a/src/Entity/Course.php b/src/Entity/Course.php
@@ -90,9 +90,9 @@ public function __construct()
 
     /**
      * Serializes Course with basic information needed by front-end.
-     * @return array|mixed
+     * @return array
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             "id" => $this->id,

diff --git a/src/Entity/FileItem.php b/src/Entity/FileItem.php
@@ -237,9 +237,9 @@ public function update($file): self
 
     /**
      * Serializes ContentItem into JSON.
-     * @return array|mixed
+     * @return array
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             'id' => $this->getId(),

diff --git a/src/Entity/Institution.php b/src/Entity/Institution.php
@@ -319,7 +319,7 @@ public function setApiClientSecret(?string $apiClientSecret): self
         return $this;
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             'id' => $this->id,

diff --git a/src/Entity/Issue.php b/src/Entity/Issue.php
@@ -87,9 +87,9 @@ public function __construct()
 
     /**
      * Serializes Issue into JSON.
-     * @return array|mixed
+     * @return array
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             "id" => $this->id,

diff --git a/src/Entity/LogEntry.php b/src/Entity/LogEntry.php
@@ -126,7 +126,7 @@ public function setStatus(?bool $status): self
         return $this;
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             'message' => $this->getMessage(),

diff --git a/src/Entity/Report.php b/src/Entity/Report.php
@@ -83,14 +83,14 @@ public function __construct()
     // Public Methods
     /**
      *
-     * @return array|mixed
+     * @return array
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return $this->toArray();
     }
 
-    public function toArray() 
+    public function toArray(): array
     {
         $result = [
             "id" => $this->id,

diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -13,7 +13,7 @@
  * @ORM\Entity(repositoryClass="App\Repository\UserRepository")
  * @ORM\Table(name="users")
  */
-class User implements UserInterface, \Serializable, JsonSerializable
+class User implements UserInterface, JsonSerializable
 {
     /**
      * @ORM\Id()
@@ -225,27 +225,21 @@ public function setLastLogin(\DateTimeInterface $lastLogin): self
         return $this;
     }
 
-    /** @see \Serializable::serialize() */
-    public function serialize()
+    public function __serialize(): array
     {
-        return serialize(array(
+        return [
             $this->id,
             $this->username,
             $this->lmsUserId
-        ));
+        ];
     }
 
-    /** @see \Serializable::unserialize() */
-    public function unserialize($serialized)
+    public function __unserialize(array $data): void
     {
-        list(
-            $this->id,
-            $this->username,
-            $this->lmsUserId
-        ) = unserialize($serialized);
+        [$this->id, $this->username, $this->lmsUserId] = $data;
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         $dateFormat = $_ENV['DATE_FORMAT'];
         $apiKey = $this->getApiKey();

diff --git a/src/Entity/UserSession.php b/src/Entity/UserSession.php
@@ -91,7 +91,7 @@ public function setCreated(\DateTimeInterface $created): self
         return $this;
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             'id' => $this->getUuid(),

diff --git a/src/Lms/LmsResponse.php b/src/Lms/LmsResponse.php
@@ -91,12 +91,12 @@ public function setResponse(ResponseInterface $response)
         $this->contentType = (isset($headers['content-type'][0])) ? $headers['content-type'][0] : false;
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             'content' => $this->getContent(),
             'errors' => $this->errors,
             'headers' => $this->headers,
         ];
     }
-}
+}
diff --git a/src/Response/ApiResponse.php b/src/Response/ApiResponse.php
@@ -62,7 +62,7 @@ public function setHtml($html)
         $this->html = $html;
     }
 
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         return [
             'messages' => $this->getMessages(),