OrderItemFile renamed to File and moved. SyncVariantFileResponse replaced by File

Author: pfkristaps

src/Structures/Order/OrderItemFile.php src/Structures/File.phpsrc/Structures/Order/OrderItemFile.php renamed to src/Structures/File.php

@@ -1,10 +1,8 @@
 <?php
 
-namespace Printful\Structures\Order;
+namespace Printful\Structures;
 
-use Printful\Structures\BaseItem;
-
-class OrderItemFile extends BaseItem
+class File extends BaseItem
 {
 
     const TYPE_PREVIEW = 'preview';
@@ -97,7 +95,7 @@ class OrderItemFile extends BaseItem
 
     /**
      * @param array $raw
-     * @return OrderItemFile
+     * @return File
      */
     public static function fromArray(array $raw)
     {

src/Structures/Order/OrderItemCreationParameters.php

@@ -2,6 +2,8 @@
 
 namespace Printful\Structures\Order;
 
+use Printful\Structures\File;
+
 class OrderItemCreationParameters
 {
     /**
@@ -35,7 +37,7 @@ class OrderItemCreationParameters
     public $sku;
 
     /**
-     * @var OrderItemFile[]
+     * @var File[]
      */
     private $files = [];
 
@@ -80,7 +82,7 @@ public function addOption($id, $value)
     }
 
     /**
-     * @return OrderItemFile[]
+     * @return File[]
      */
     public function getFiles()
     {

src/Structures/Order/OrderLineItem.php

@@ -3,6 +3,7 @@
 namespace Printful\Structures\Order;
 
 use Printful\Structures\BaseItem;
+use Printful\Structures\File;
 
 class OrderLineItem extends BaseItem
 {
@@ -43,7 +44,7 @@ class OrderLineItem extends BaseItem
     public $name;
 
     /**
-     * @var OrderItemFile[]
+     * @var File[]
      */
     public $files = [];
 
@@ -81,7 +82,7 @@ public static function fromArray(array $raw)
         $item->sku = $raw['sku'];
 
         foreach ($raw['files'] as $v) {
-            $item->files[] = OrderItemFile::fromArray($v);
+            $item->files[] = File::fromArray($v);
         }
 
         foreach ($raw['options'] as $v) {

src/Structures/Sync/Requests/SyncVariantRequestFile.php

@@ -3,13 +3,12 @@
 namespace Printful\Structures\Sync\Requests;
 
 use Printful\Exceptions\PrintfulSdkException;
+use Printful\Structures\File;
 
 class SyncVariantRequestFile
 {
-    const TYPE_DEFAULT = 'default';
-
     /** @var string */
-    public $type = self::TYPE_DEFAULT;
+    public $type = File::TYPE_DEFAULT;
 
     /** @var int */
     public $id;
@@ -27,7 +26,7 @@ public static function fromArray(array $array)
     {
         $file = new SyncVariantRequestFile;
 
-        $file->type = isset($array['type']) ? (string)$array['type'] : self::TYPE_DEFAULT;
+        $file->type = isset($array['type']) ? (string)$array['type'] : File::TYPE_DEFAULT;
         $file->id = isset($array['id']) ? (int)$array['id'] : null;
         $file->url = isset($array['url']) ? (string)$array['url'] : null;
 

src/Structures/Sync/Responses/SyncVariantFileResponse.php

@@ -3,6 +3,7 @@
 namespace Printful\Structures\Sync\Responses;
 
 use Printful\Structures\BaseItem;
+use Printful\Structures\File;
 
 class SyncVariantResponse extends BaseItem
 {
@@ -33,7 +34,7 @@ class SyncVariantResponse extends BaseItem
     /** @var SyncVariantProductResponse */
     public $product;
 
-    /** @var SyncVariantFileResponse[] */
+    /** @var File[] */
     public $files = [];
 
     /** @var SyncVariantOptionResponse[] */
@@ -61,7 +62,7 @@ public static function fromArray(array $array)
 
         $variantFiles = (array)$array['files'] ?: [];
         foreach ($variantFiles as $file) {
-            $variant->files[] = SyncVariantFileResponse::fromArray($file);
+            $variant->files[] = File::fromArray($file);
         }
 
         $variantOptions = (array)$array['options'] ?: [];

src/Structures/Sync/Responses/SyncVariantResponse.php

@@ -7,7 +7,7 @@
 use Printful\Structures\Order\OrderCostsItem;
 use Printful\Structures\Order\OrderCreationParameters;
 use Printful\Structures\Order\OrderItemCreationParameters;
-use Printful\Structures\Order\OrderItemFile;
+use Printful\Structures\File;
 use Printful\Structures\Order\OrderList;
 use Printful\Structures\Order\RecipientCreationParameters;
 use Printful\Tests\TestCase;
@@ -19,6 +19,9 @@ class OrderCreationAndRetrievalTest extends TestCase
      */
     private $printfulOrder;
 
+    /**
+     * @throws Exception
+     */
     protected function setUp()
     {
         parent::setUp();
@@ -64,7 +67,7 @@ public function testOrderCanBeUpdated()
         $itemParams->quantity = 1;
         $itemParams->retailPrice = 23.99;
         $itemParams->addFile(
-            OrderItemFile::TYPE_DEFAULT,
+            File::TYPE_DEFAULT,
             'https://pbs.twimg.com/profile_images/1044686525/Get_Some.jpg'
         );
         $params->addItem($itemParams);
@@ -98,6 +101,10 @@ public function testOrderListCanBeRetrieved()
         self::assertInstanceOf(OrderList::class, $orderList, 'Order List retrieved');
     }
 
+    /**
+     * @throws \Printful\Exceptions\PrintfulApiException
+     * @throws \Printful\Exceptions\PrintfulException
+     */
     public function testOrderCostsCanBeEstimated()
     {
         $externalId = uniqid();
@@ -139,7 +146,7 @@ private function getTestOrderParams()
         $itemParams->name = 'Some item name';
         $itemParams->sku = '00000000';
         $itemParams->addFile(
-            OrderItemFile::TYPE_DEFAULT,
+            File::TYPE_DEFAULT,
             'https://placeholdit.imgix.net/~text?txtsize=200&txt=2400%C3%972400&w=2400&h=2400'
         );
         $params->addItem($itemParams);