Revert Merge remote-tracking branch 'origin/shopify' into develop (92dd2a35) · Commits · without_auth / meibuyu-rpc

src/Shopify/ShopifyApp.php

+0 −8

Original line number	Diff line number	Diff line
		@@ -14,8 +14,6 @@ use Meibuyu\Micro\Shopify\lib\Collect;
		use Meibuyu\Micro\Shopify\lib\Collection;
		use Meibuyu\Micro\Shopify\lib\CustomCollection;
		use Meibuyu\Micro\Shopify\lib\Metafield;
		use Meibuyu\Micro\Shopify\lib\Product;
		use Meibuyu\Micro\Shopify\lib\ProductVariant;
		use Meibuyu\Micro\Shopify\lib\SmartCollection;
		use Meibuyu\Micro\Shopify\lib\Webhook;

		@@ -29,16 +27,12 @@ use Meibuyu\Micro\Shopify\lib\Webhook;
		* @property-read CustomCollection $CustomCollection
		* @property-read SmartCollection $SmartCollection
		* @property-read Metafield $Metafield
		* @property-read Product $Product
		* @property-read ProductVariant $ProductVariant
		*
		* @method Webhook Webhook(integer $id = null)
		* @method Collection Collection(integer $id = null)
		* @method CustomCollection CustomCollection(integer $id = null)
		* @method SmartCollection SmartCollection(integer $id = null)
		* @method Metafield Metafield(integer $id = null)
		* @method Product Product(integer $id = null)
		* @method ProductVariant ProductVariant(integer $id = null)
		*
		*/
		class ShopifyApp
		@@ -51,8 +45,6 @@ class ShopifyApp
		'CustomCollection',
		'SmartCollection',
		'Metafield',
		'Product',
		'ProductVariant',
		];

		protected $childResources = array(

src/Shopify/lib/AbstractShopify.php

+19 −115

Original line number	Diff line number	Diff line
		@@ -153,95 +153,6 @@ abstract class AbstractShopify
		return $resourceUrl . ($customAction ? "/$customAction" : '') . '.json' . (!empty($urlParams) ? '?' . http_build_query($urlParams) : '');
		}

		// /**
		// * @param array $urlParams
		// * @param null $url
		// * @param null $dataKey
		// * @return mixed
		// * @throws Exception
		// */
		// public function get($urlParams = [], $url = null, $dataKey = null)
		// {
		// if (!$url) $url = $this->generateUrl($urlParams);
		// $response = HttpRequestJson::get($url, $this->httpHeaders);
		// if (!$dataKey) $dataKey = $this->id ? $this->resourceKey : $this->pluralizeKey;
		// return $this->processResponse($response, $dataKey);
		// }
		//
		// /**
		// * 根据id获取一条数据
		// * @param $id
		// * @param array $urlParams
		// * @return mixed
		// * @throws Exception
		// */
		// public function show($id, $urlParams = [])
		// {
		// $url = $this->generateUrl($urlParams, $id);
		// $response = HttpRequestJson::get($url, $this->httpHeaders);
		// return $this->processResponse($response, $this->resourceKey);
		// }
		//
		// /**
		// * 获取数量
		// * @param array $urlParams
		// * @return mixed
		// * @throws Exception
		// */
		// public function count($urlParams = [])
		// {
		// if (!$this->countEnabled) {
		// throw new Exception("当前类{$this->getResourceName()}不支持count()方法");
		// }
		// $url = $this->generateUrl($urlParams, null, 'count');
		// return $this->get([], $url, 'count');
		// }
		//
		// /**
		// * @param $dataArray
		// * @param null $url
		// * @param bool $wrapData
		// * @return mixed
		// * @throws Exception
		// */
		// public function post($dataArray, $url = null, $wrapData = true)
		// {
		// if (!$url) $url = $this->generateUrl();
		// if ($wrapData && !empty($dataArray)) $dataArray = $this->wrapData($dataArray);
		// $response = HttpRequestJson::post($url, $dataArray, $this->httpHeaders);
		// return $this->processResponse($response, $this->resourceKey);
		// }
		//
		// /**
		// * @param int\|string $id
		// * @param $dataArray
		// * @param null $url
		// * @param bool $wrapData
		// * @return mixed
		// * @throws Exception
		// */
		// public function put($id, $dataArray, $url = null, $wrapData = true)
		// {
		// if (!$url) $url = $this->generateUrl([], $id);
		// if ($wrapData && !empty($dataArray)) $dataArray = $this->wrapData($dataArray);
		// $response = HttpRequestJson::put($url, $dataArray, $this->httpHeaders);
		// return $this->processResponse($response, $this->resourceKey);
		// }
		//
		// /**
		// * @param int\|string $id
		// * @param array $urlParams
		// * @param null $url
		// * @return mixed
		// * @throws Exception
		// */
		// public function delete($id = null, $urlParams = [], $url = null)
		// {
		// if (!$url) $url = $this->generateUrl($urlParams, $id);
		// $response = HttpRequestJson::delete($url, $this->httpHeaders);
		// return $this->processResponse($response);
		// }

		/**
		* @param array $urlParams
		* @param null $url
		@@ -271,6 +182,21 @@ abstract class AbstractShopify
		return $this->processResponse($response, $this->resourceKey);
		}

		/**
		* 获取数量
		* @param array $urlParams
		* @return mixed
		* @throws Exception
		*/
		public function count($urlParams = [])
		{
		if (!$this->countEnabled) {
		throw new Exception("当前类{$this->getResourceName()}不支持count()方法");
		}
		$url = $this->generateUrl($urlParams, null, 'count');
		return $this->get([], $url, 'count');
		}

		/**
		* @param $dataArray
		* @param null $url
		@@ -342,36 +268,14 @@ abstract class AbstractShopify
		* @return mixed
		* @throws Exception
		*/
		// public function processResponse($response, $dataKey = null)
		// {
		// $httpCode = $response->getStatusCode();
		// $content = $response->getBody()->getContents();
		// $content = json_decode($content, true);
		//
		// if (isset($content['errors'])) {
		// throw new Exception($this->castString($content['errors']), $httpCode);
		// }
		// if ($dataKey && isset($content[$dataKey])) {
		// return $content[$dataKey];
		// } else {
		// return $content;
		// }
		// }

		/**
		* 处理响应
		* @param array $response
		* @param null $dataKey
		* @return mixed
		* @throws Exception
		*/
		public function processResponse($response, $dataKey = null)
		{
		[$code, $header, $body] = $response;
		$content = json_decode($body, true);
		$httpCode = $response->getStatusCode();
		$content = $response->getBody()->getContents();
		$content = json_decode($content, true);

		if (isset($content['errors'])) {
		throw new Exception($this->castString($content['errors']), $code);
		throw new Exception($this->castString($content['errors']), $httpCode);
		}
		if ($dataKey && isset($content[$dataKey])) {
		return $content[$dataKey];

src/Shopify/lib/Product.php

deleted100644 → 0

+0 −34

Original line number	Diff line number	Diff line
		<?php
		/**
		* Created by PhpStorm.
		* User: Zero
		* Date: 2020/9/2
		* Time: 16:50
		*/

		namespace Meibuyu\Micro\Shopify\lib;

		/**
		* Class Product
		* @package Meibuyu\Micro\Shopify\lib
		*
		* @property-read ProductImage $Image
		* @property-read ProductVariant $Variant
		* @property-read Metafield $Metafield
		*
		* @method ProductImage Image(integer $id = null)
		* @method ProductVariant Variant(integer $id = null)
		* @method Metafield Metafield(integer $id = null)
		*/
		class Product extends AbstractShopify
		{

		protected $resourceKey = 'product';

		protected $childResource = [
		'ProductImage' => 'Image',
		'ProductVariant' => 'Variant',
		'Metafield',
		];

		}

src/Shopify/lib/ProductImage.php

deleted100644 → 0

+0 −16

Original line number	Diff line number	Diff line
		<?php
		/**
		* Created by PhpStorm.
		* User: Zero
		* Date: 2020/9/2
		* Time: 16:50
		*/

		namespace Meibuyu\Micro\Shopify\lib;

		class ProductImage extends AbstractShopify
		{

		protected $resourceKey = 'image';

		}

src/Shopify/lib/ProductVariant.php

deleted100644 → 0

+0 −28

Original line number	Diff line number	Diff line
		<?php
		/**
		* Created by PhpStorm.
		* User: Zero
		* Date: 2020/9/2
		* Time: 16:50
		*/

		namespace Meibuyu\Micro\Shopify\lib;

		/**
		* Class ProductVariant
		* @package Meibuyu\Micro\Shopify\lib
		*
		* @property-read Metafield $Metafield
		*
		* @method Metafield Metafield(integer $id = null)
		*/
		class ProductVariant extends AbstractShopify
		{

		protected $resourceKey = 'variant';

		protected $childResource = [
		'Metafield',
		];

		}