Try and fix PHP5

dvdoug · Jan 25, 2020 · 9ceec92 · 9ceec92
1 parent dbb0e69
commit 9ceec92
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/src/OrientatedItemFactory.php b/src/OrientatedItemFactory.php
@@ -96,8 +96,8 @@ public function getBestOrientation(
 
             // prefer leaving room for next item in current row
             if ($nextItems->count()) {
-                $nextItemFitA = count($this->getPossibleOrientations($nextItems->top(), $a, $orientationAWidthLeft, $lengthLeft, $depthLeft, $x, $y, $z, $prevPackedItemList));
-                $nextItemFitB = count($this->getPossibleOrientations($nextItems->top(), $b, $orientationBWidthLeft, $lengthLeft, $depthLeft, $x, $y, $z, $prevPackedItemList));
+                $nextItemFitA = $this->getPossibleOrientations($nextItems->top(), $a, $orientationAWidthLeft, $lengthLeft, $depthLeft, $x, $y, $z, $prevPackedItemList);
+                $nextItemFitB = $this->getPossibleOrientations($nextItems->top(), $b, $orientationBWidthLeft, $lengthLeft, $depthLeft, $x, $y, $z, $prevPackedItemList);
                 if ($nextItemFitA && !$nextItemFitB) {
                     return -1;
                 }
@@ -356,7 +356,7 @@ protected function calculateAdditionalItemsPackedWithThisOrientation(
 
         if (!isset(static::$lookaheadCache[$cacheKey])) {
             $tempBox = new WorkingVolume($originalWidthLeft - $prevItem->getWidth(), $currentRowLength, $depthLeft, PHP_INT_MAX);
-            $tempPacker = new VolumePacker($tempBox, clone $itemsToPack);
+            $tempPacker = new VolumePacker($tempBox, $itemsToPack);
             $tempPacker->setLookAheadMode(true);
             $remainingRowPacked = $tempPacker->pack();
             /** @var PackedItem $packedItem */
@@ -365,7 +365,7 @@ protected function calculateAdditionalItemsPackedWithThisOrientation(
             }
 
             $tempBox = new WorkingVolume($originalWidthLeft, $originalLengthLeft - $currentRowLength, $depthLeft, PHP_INT_MAX);
-            $tempPacker = new VolumePacker($tempBox, clone $itemsToPack);
+            $tempPacker = new VolumePacker($tempBox, $itemsToPack);
             $tempPacker->setLookAheadMode(true);
             $nextRowsPacked = $tempPacker->pack();
             /** @var PackedItem $packedItem */

diff --git a/src/PackedBoxList.php b/src/PackedBoxList.php
@@ -47,6 +47,10 @@ public function compare($boxA, $boxB)
             $choice = $boxB->getWeight() - $boxA->getWeight();
         }
 
+        if ($choice == 0) {
+            $choice = PHP_MAJOR_VERSION > 5 ? -1 : 1;
+        }
+
         return $choice;
 
     }

diff --git a/src/Packer.php b/src/Packer.php
@@ -233,6 +233,9 @@ private static function compare(PackedBox $boxA, PackedBox $boxB)
         if ($choice == 0) {
             $choice = $boxB->getUsedVolume() - $boxA->getUsedVolume();
         }
+        if ($choice == 0) {
+            $choice = PHP_MAJOR_VERSION > 5 ? -1 : 1;
+        }
 
         return $choice;
     }