Fixed composer to work with packagist. Fixed risky tests.

pdt256 · Dec 12, 2019 · 8a4a7eb · 8a4a7eb
1 parent 8d1cd60
commit 8a4a7eb
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 24 deletions.
diff --git a/.idea/runConfigurations/All_Unit_Tests.xml b/.idea/runConfigurations/All_Unit_Tests.xml
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.0"
+            "dev-master": "1.0.x-dev"
         }
     },
     "require-dev": {

diff --git a/src/RateAdapter.php b/src/RateAdapter.php
@@ -1,8 +1,6 @@
 <?php
 namespace pdt256\Shipping;
 
-use Exception;
-
 abstract class RateAdapter
 {
     protected $isProduction;
@@ -18,20 +16,25 @@ abstract class RateAdapter
 
     /**
      * Make sure all necessary fields are set
+     * @return self
      */
     abstract protected function validate();
+
     /**
      * Prepare XML
+     * @return self
      */
     abstract protected function prepare();
 
     /**
      * Curl Request
+     * @return self
      */
     abstract protected function execute();
 
     /**
      * Convert to shipping rates array
+     * @return self
      */
     abstract protected function process();
 
@@ -71,17 +74,20 @@ public function getShipment()
         return $this->shipment;
     }
 
-    public function setIsProduction($isProduction)
+    public function setIsProduction($isProduction): void
     {
         $this->isProduction = $isProduction;
     }
 
-    public function getIsProduction()
+    public function getIsProduction(): bool
     {
         return $this->isProduction;
     }
 
-    public function getRates()
+    /**
+     * @return Quote[]
+     */
+    public function getRates(): array
     {
         $this
             ->validate()
@@ -93,9 +99,9 @@ public function getRates()
         return array_values($this->rates);
     }
 
-    protected function sortByCost()
+    protected function sortByCost(): void
     {
-        uasort($this->rates, function ($a, $b) {
+        uasort($this->rates, static function (Quote $a, Quote $b) {
             return ($a->getCost() > $b->getCost());
         });
     }

diff --git a/tests/PackageDimensionsTest.php → tests/PackageDimensionsValidationTrait.php b/tests/PackageDimensionsTest.php → tests/PackageDimensionsValidationTrait.php
@@ -108,33 +108,39 @@ protected function validatePackage(Package $package, RateAdapter $adapter)
          ->addPackage($package);
         $adapter->setShipment($shipment);
         $adapter->getRates();
+
+        $this->assertEquals($shipment, $adapter->getShipment());
     }
 
     public function testNormalUSPS()
     {
         $this->validatePackage($this->getNormalPackage(), $this->getUSPSAdapter());
     }
+
     /**
      * @expectedException \LogicException
      */
     public function testNoHeightPackageUSPS()
     {
         $this->validatePackage($this->getNoHeightPackage(), $this->getUSPSAdapter());
     }
+
     /**
      * @expectedException \LogicException
      */
     public function testNoLengthPackageUSPS()
     {
         $this->validatePackage($this->getNoLengthPackage(), $this->getUSPSAdapter());
     }
+
     /**
      * @expectedException \LogicException
      */
     public function testNoWidthPackageUSPS()
     {
         $this->validatePackage($this->getNoWidthPackage(), $this->getUSPSAdapter());
     }
+
     /**
      * @expectedException \LogicException
      */
@@ -148,27 +154,31 @@ public function testNormalUPS()
     {
         $this->validatePackage($this->getNormalPackage(), $this->getUPSAdapter());
     }
+
     /**
      * @expectedException \LogicException
      */
     public function testNoHeightPackageUPS()
     {
         $this->validatePackage($this->getNoHeightPackage(), $this->getUPSAdapter());
     }
+
     /**
      * @expectedException \LogicException
      */
     public function testNoLengthPackageUPS()
     {
         $this->validatePackage($this->getNoLengthPackage(), $this->getUPSAdapter());
     }
+
     /**
      * @expectedException \LogicException
      */
     public function testNoWidthPackageUPS()
     {
         $this->validatePackage($this->getNoWidthPackage(), $this->getUPSAdapter());
     }
+
     /**
      * @expectedException \LogicException
      */
@@ -182,27 +192,31 @@ public function testNormalFedex()
     {
         $this->validatePackage($this->getNormalPackage(), $this->getFedexAdapter());
     }
+
     /**
      * @expectedException \LogicException
      */
     public function testNoHeightPackageFedex()
     {
         $this->validatePackage($this->getNoHeightPackage(), $this->getFedexAdapter());
     }
+
     /**
      * @expectedException \LogicException
      */
     public function testNoLengthPackageFedex()
     {
         $this->validatePackage($this->getNoLengthPackage(), $this->getFedexAdapter());
     }
+
     /**
      * @expectedException \LogicException
      */
     public function testNoWidthPackageFedex()
     {
         $this->validatePackage($this->getNoWidthPackage(), $this->getFedexAdapter());
     }
+
     /**
      * @expectedException \LogicException
      */

diff --git a/tests/RateAdapterTest.php b/tests/RateAdapterTest.php
diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php
@@ -2,6 +2,7 @@
 namespace pdt256\Shipping;
 
 use PHPUnit\Framework\TestCase;
+use stdClass;
 
 class ValidatorTest extends TestCase
 {
@@ -17,8 +18,9 @@ public function testNotNull()
     {
         Validator::checkIfNull('XXX', 'notNullValue');
         Validator::checkIfNull([], 'notNullValue');
-        Validator::checkIfNull(new \stdClass(), 'notNullValue');
+        Validator::checkIfNull(new stdClass(), 'notNullValue');
         Validator::checkIfNull(function () {
         }, 'notNullValue');
+        $this->assertTrue(true);
     }
 }