Minor fixes and php version upgraded to 7.4 features project

danish981 · Nov 9, 2022 · e137d06 · e137d06
1 parent bfacbf1
commit e137d06
Show file tree

Hide file tree

Showing 8 changed files with 1,965 additions and 1,964 deletions.
diff --git a/admin_add.php b/admin_add.php
@@ -23,7 +23,7 @@
     $descr = validateField($_POST['descr']);
     $descr = mysqli_real_escape_string($conn, $descr);
 
-    $price = floatval(validateField($_POST['price']));
+    $price = (float)validateField($_POST['price']);
     $price = mysqli_real_escape_string($conn, $price);
 
     // it is drop down, no need of its validation

diff --git a/models/goods/Book.php b/models/goods/Book.php
@@ -10,33 +10,33 @@
 });
 
 class Book implements Damage {
-    private static $objects = [];
-    private $id;
-    private $name;
-    private $author;
-    private $publisher;
-    private $genre;
-    private $isbn;
-    private $sellPrice;
-    private $buyPrice;
-    private $image;
-    private $description;
-    private $actualQuantity;
-    private $quantity;
+    private static array $objects = [];
+    private int $id;
+    private string $name;
+    private string $author;
+    private string $publisher;
+    private string $genre;
+    private string $isbn;
+    private float $sellPrice;
+    private float $buyPrice;
+    private string $image;
+    private string $description;
+    private int $actualQuantity;
+    private int $quantity;
 
     public function __construct(
-        $id,
-        $name,
-        int $isbn,
-        float $sellPrice,
-        float $buyPrice,
-        string $image,
-        string $description,
-        int $actualQuantity,
-        int $quantity,
-        Author $author = NULL,
+        int        $id,
+        string     $name,
+        string     $isbn,
+        float      $sellPrice,
+        float      $buyPrice,
+        string     $image,
+        string     $description,
+        int        $actualQuantity,
+        int        $quantity,
+        Author     $author = NULL,
         Publishers $publisher = NULL,
-        Genre $genre = NULL) {
+        Genre      $genre = NULL) {
         $this->id = $id;
         $this->name = $name;
         $this->author = $author;
@@ -69,25 +69,25 @@ public function add($quantity) {
         $this->actualQuantity += $quantity;
     }
 
-    public function backBook($amount) {
+    public function increaseBooks($amount) {
         $this->quantity += $amount;
     }
 
-    public function delivering_done($amount) {
+    public function deliveringDone($amount) {
         $this->actualQuantity -= $amount;
     }
 
     public function damageAllData() {
-        $this->id = NULL;
+        $this->id = -1;
         $this->name = NULL;
-        $this->quantity = NULL;
+        $this->quantity = 0;
         $this->author = NULL;
         $this->isbn = NULL;
-        $this->buyPrice = NULL;
-        $this->sellPrice = NULL;
+        $this->buyPrice = 0;
+        $this->sellPrice = -1;
         $this->image = NULL;
         $this->description = NULL;
-        $this->actualQuantity = NULL;
+        $this->actualQuantity = -1;
         $this->genre = NULL;
     }
 

diff --git a/models/goods/Genre.php b/models/goods/Genre.php
@@ -10,15 +10,15 @@
 });
 
 class Genre {
-    private $description;
+    private string $description;
     private $id;
 
     public function __construct($description, $id = NULL) {
         $this->description = $description;
         $this->id = $id;
     }
 
-    public function getDescription() {
+    public function getDescription() : string {
         return $this->description;
     }
 

diff --git a/models/goods/Publishers.php b/models/goods/Publishers.php
@@ -10,7 +10,7 @@
 });
 
 class Publishers {
-    private $name;
+    private string $name;
     private $address;
     private $id;
 
@@ -20,7 +20,7 @@ public function __construct($name, $id = NULL, $address = NULL) {
         $this->id = $id;
     }
 
-    public function getName() {
+    public function getName() : string {
         return $this->name;
     }
 

diff --git a/models/image/ResizeImage.php b/models/image/ResizeImage.php
@@ -70,7 +70,7 @@ private function setImage($filename) {
     /**
      * Save the image as the image type the original image was
      * @param $savePath
-     * @param  string $imageQuality - The qulaity level of image to create
+     * @param string $imageQuality - The qulaity level of image to create
      * @param bool $download
      * @return Saves the image
      * @internal param $String [type] $savePath     - The path to store the new image
@@ -109,9 +109,9 @@ public function saveImage($savePath, $imageQuality = "100", $download = false) {
 
     /**
      * Resize the image to these set dimensions
-     * @param  int $width - Max width of the image
-     * @param  int $height - Max height of the image
-     * @param  string $resizeOption - Scale option for the image
+     * @param int $width - Max width of the image
+     * @param int $height - Max height of the image
+     * @param string $resizeOption - Scale option for the image
      * @return Save new image
      */
     public function resizeTo($width, $height, $resizeOption = 'default') {
@@ -149,7 +149,7 @@ public function resizeTo($width, $height, $resizeOption = 'default') {
 
     /**
      * Get the resized height from the width keeping the aspect ratio
-     * @param  int $width - Max image width
+     * @param int $width - Max image width
      * @return float
      */
     private function resizeHeightByWidth($width) {
@@ -158,7 +158,7 @@ private function resizeHeightByWidth($width) {
 
     /**
      * Get the resized width from the height keeping the aspect ratio
-     * @param  int $height - Max image height
+     * @param int $height - Max image height
      * @return float
      */
     private function resizeWidthByHeight($height) {