Update CS to PER

.php-cs-fixer.dist.php

@@ -28,6 +28,9 @@
             'separate' => 'none',
             'header' => "Box packing (3D bin packing, knapsack problem).\n\n@author Doug Wright",
         ],
+        'phpdoc_line_span' => true,
+        'phpdoc_to_comment' => false,
+        'ordered_imports' => ['imports_order' => ['class', 'function', 'const'], 'sort_algorithm' => 'none'],
     ]
 )
     ->setRiskyAllowed(true)

src/BoxList.php

@@ -19,7 +19,9 @@
  */
 class BoxList implements IteratorAggregate
 {
-    /** @var Box[] */
+    /**
+     * @var Box[]
+     */
     private array $list = [];
 
     private bool $isSorted = false;
@@ -34,8 +36,7 @@ public function __construct(?BoxSorter $sorter = null)
     /**
      * Do a bulk create.
      *
-     * @param  Box[]   $boxes
-     * @return BoxList
+     * @param Box[] $boxes
      */
     public static function fromArray(array $boxes, bool $preSorted = false): self
     {

src/ItemList.php

@@ -8,35 +8,30 @@
 
 namespace DVDoug\BoxPacker;
 
+use ArrayIterator;
+use Countable;
+use IteratorAggregate;
+use Traversable;
+
 use function array_key_last;
 use function array_pop;
 use function array_reverse;
 use function array_slice;
-
-use ArrayIterator;
-
 use function count;
-
-use Countable;
-
 use function current;
 use function end;
-
-use IteratorAggregate;
-
 use function key;
 use function prev;
-
-use Traversable;
-
 use function usort;
 
 /**
  * List of items to be packed, ordered by volume.
  */
 class ItemList implements Countable, IteratorAggregate
 {
-    /** @var Item[] */
+    /**
+     * @var Item[]
+     */
     private array $list = [];
 
     private bool $isSorted = false;
@@ -55,8 +50,7 @@ public function __construct(?ItemSorter $sorter = null)
     /**
      * Do a bulk create.
      *
-     * @param  Item[]   $items
-     * @return ItemList
+     * @param Item[] $items
      */
     public static function fromArray(array $items, bool $preSorted = false): self
     {
@@ -148,7 +142,6 @@ public function top(): Item
 
     /**
      * @internal
-     * @return ItemList
      */
     public function topN(int $n): self
     {

src/LayerPacker.php

@@ -8,14 +8,13 @@
 
 namespace DVDoug\BoxPacker;
 
-use function array_merge;
-use function iterator_to_array;
-use function max;
-
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
+use function array_merge;
+use function iterator_to_array;
+use function max;
 use function sort;
 
 /**

src/OrientatedItem.php

@@ -8,10 +8,9 @@
 
 namespace DVDoug\BoxPacker;
 
-use function atan;
-
 use JsonSerializable;
 
+use function atan;
 use function min;
 use function sort;
 
@@ -30,10 +29,14 @@ class OrientatedItem implements JsonSerializable
 
     protected int $surfaceFootprint;
 
-    /** @var array<string, bool> */
+    /**
+     * @var array<string, bool>
+     */
     protected static array $stabilityCache = [];
 
-    /** @var int[] */
+    /**
+     * @var int[]
+     */
     protected array $dimensionsAsArray;
 
     public function __construct(Item $item, int $width, int $length, int $depth)

src/OrientatedItemFactory.php

@@ -8,13 +8,12 @@
 
 namespace DVDoug\BoxPacker;
 
-use function array_filter;
-use function count;
-
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
+use function array_filter;
+use function count;
 use function usort;
 
 /**
@@ -29,7 +28,9 @@ class OrientatedItemFactory implements LoggerAwareInterface
 
     protected bool $singlePassMode = false;
 
-    /** @var array<string, bool> */
+    /**
+     * @var array<string, bool>
+     */
     protected static array $emptyBoxStableItemOrientationCache = [];
 
     public function __construct(Box $box)

src/OrientatedItemSorter.php

@@ -8,13 +8,13 @@
 
 namespace DVDoug\BoxPacker;
 
+use Psr\Log\LoggerInterface;
+
 use function max;
 use function min;
 
 use const PHP_INT_MAX;
 
-use Psr\Log\LoggerInterface;
-
 /**
  * Figure out best choice of orientations for an item and a given context.
  * @internal
@@ -23,7 +23,9 @@ class OrientatedItemSorter
 {
     private LoggerInterface $logger;
 
-    /** @var array<string, int> */
+    /**
+     * @var array<string, int>
+     */
     protected static array $lookaheadCache = [];
 
     private OrientatedItemFactory $orientatedItemFactory;

src/PackedBox.php

@@ -8,11 +8,10 @@
 
 namespace DVDoug\BoxPacker;
 
-use function iterator_to_array;
-use function json_encode;
-
 use JsonSerializable;
 
+use function iterator_to_array;
+use function json_encode;
 use function max;
 use function round;
 use function urlencode;

src/PackedBoxList.php

@@ -9,21 +9,15 @@
 namespace DVDoug\BoxPacker;
 
 use ArrayIterator;
-
-use function count;
-
 use Countable;
 use IteratorAggregate;
-
-use function json_encode;
-
 use JsonSerializable;
+use Traversable;
 
+use function count;
+use function json_encode;
 use function reset;
 use function round;
-
-use Traversable;
-
 use function urlencode;
 use function usort;
 
@@ -32,7 +26,9 @@
  */
 class PackedBoxList implements IteratorAggregate, Countable, JsonSerializable
 {
-    /** @var PackedBox[] */
+    /**
+     * @var PackedBox[]
+     */
     private array $list = [];
 
     private bool $isSorted = false;

src/PackedItem.php

@@ -80,9 +80,6 @@ public function getVolume(): int
         return $this->width * $this->length * $this->depth;
     }
 
-    /**
-     * @return PackedItem
-     */
     public static function fromOrientatedItem(OrientatedItem $orientatedItem, int $x, int $y, int $z): self
     {
         return new self(

src/PackedItemList.php

@@ -8,24 +8,23 @@
 
 namespace DVDoug\BoxPacker;
 
-use function array_map;
-
 use ArrayIterator;
-
-use function count;
-
 use Countable;
 use IteratorAggregate;
 use Traversable;
 
+use function array_map;
+use function count;
 use function usort;
 
 /**
  * List of packed items, ordered by volume.
  */
 class PackedItemList implements Countable, IteratorAggregate
 {
-    /** @var PackedItem[] */
+    /**
+     * @var PackedItem[]
+     */
     private array $list = [];
 
     private int $weight = 0;

src/PackedLayer.php

@@ -33,7 +33,9 @@ class PackedLayer
 
     private int $weight = 0;
 
-    /** @var PackedItem[] */
+    /**
+     * @var PackedItem[]
+     */
     protected array $items = [];
 
     /**

src/Packer.php

@@ -8,22 +8,19 @@
 
 namespace DVDoug\BoxPacker;
 
-use function array_merge;
-use function array_pop;
-use function count;
-
 use DVDoug\BoxPacker\Exception\NoBoxesAvailableException;
-
-use const PHP_INT_MAX;
-
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
 use Psr\Log\NullLogger;
+use WeakMap;
 
+use function array_merge;
+use function array_pop;
+use function count;
 use function usort;
 
-use WeakMap;
+use const PHP_INT_MAX;
 
 /**
  * Actual packer.
@@ -38,7 +35,9 @@ class Packer implements LoggerAwareInterface
 
     protected BoxList $boxes;
 
-    /** @var WeakMap<Box, int> */
+    /**
+     * @var WeakMap<Box, int>
+     */
     protected WeakMap $boxQuantitiesAvailable;
 
     protected PackedBoxSorter $packedBoxSorter;

src/VolumePacker.php

@@ -8,14 +8,13 @@
 
 namespace DVDoug\BoxPacker;
 
-use function array_map;
-use function count;
-use function max;
-
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 
+use function array_map;
+use function count;
+use function max;
 use function reset;
 use function usort;
 

src/WeightRedistributor.php

@@ -8,23 +8,21 @@
 
 namespace DVDoug\BoxPacker;
 
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LogLevel;
+use Psr\Log\NullLogger;
+use WeakMap;
+
 use function array_filter;
 use function array_map;
 use function array_merge;
 use function array_sum;
 use function assert;
 use function count;
 use function iterator_to_array;
-
-use Psr\Log\LoggerAwareInterface;
-use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;
-use Psr\Log\NullLogger;
-
 use function usort;
 
-use WeakMap;
-
 /**
  * Actual packer.
  * @internal
@@ -35,7 +33,9 @@ class WeightRedistributor implements LoggerAwareInterface
 
     private BoxList $boxes;
 
-    /** @var WeakMap<Box, int> */
+    /**
+     * @var WeakMap<Box, int>
+     */
     private WeakMap $boxQuantitiesAvailable;
 
     private PackedBoxSorter $packedBoxSorter;