Merge pull request #135 from cloudflare/jwineman/PI-1032-Host-Login-B…

…roken Jwineman/pi 1032 host login broken
cloudflare · Mar 8, 2017 · 5fd19b3 · 5fd19b3
2 parents aa30914 + d1fee7b
commit 5fd19b3
Show file tree

Hide file tree

Showing 789 changed files with 27,736 additions and 61,641 deletions.
diff --git a/composer.json b/composer.json
@@ -11,8 +11,8 @@
   },
   "require": {
     "symfony/yaml": "~2.6",
-    "guzzle/guzzle": "~3.9",
-    "cloudflare/cloudflare-plugin-backend": "^1.0"
+    "guzzlehttp/guzzle": "~5.0",
+    "cloudflare/cloudflare-plugin-backend": "2.0.0"
   },
   "require-dev": {
     "phpunit/phpunit": "4.8.*",

diff --git a/composer.lock b/composer.lock
diff --git a/proxy.live.php b/proxy.live.php
@@ -1,4 +1,5 @@
 <?php
+use CF\API\Client;
 
 require_once 'cloudflare/vendor/autoload.php';
 require_once '/usr/local/cpanel/php/cpanel.php';
@@ -18,9 +19,12 @@
 $cpanelIntegration = new CF\Integration\DefaultIntegration($config, $cpanelAPI, $dataStore, $logger);
 $partialZoneSet = new \CF\Cpanel\Zone\Partial($cpanelAPI, $dataStore, $logger);
 $requestRouter = new \CF\Router\RequestRouter($cpanelIntegration);
-$requestRouter->addRouter('\CF\API\Client', \CF\Cpanel\ClientV4APIRoutes::$routes);
-$requestRouter->addRouter('\CF\API\Plugin', \CF\Cpanel\PluginRoutes::getRoutes(\CF\API\PluginRoutes::$routes));
-$requestRouter->addRouter('\CF\API\Host', \CF\Cpanel\HostRoutes::$routes);
+$clientAPI = new \CF\API\Client($cpanelIntegration);
+$requestRouter->addRouter($clientAPI, \CF\Cpanel\ClientV4APIRoutes::$routes);
+$pluginAPI = new \CF\API\Plugin($cpanelIntegration);
+$requestRouter->addRouter($pluginAPI, \CF\Cpanel\PluginRoutes::getRoutes(\CF\API\PluginRoutes::$routes));
+$hostAPI = new \CF\API\Host($cpanelIntegration);
+$requestRouter->addRouter($hostAPI, \CF\Cpanel\HostRoutes::$routes);
 
 $method = $_SERVER['REQUEST_METHOD'];
 $parameters = $_GET;

diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit351ea891ccabaab01d88c0a188c847e9::getLoader();
+return ComposerAutoloaderInit3d39e9b308eedc432af862a2dd3838a5::getLoader();
diff --git a/vendor/cloudflare/cloudflare-plugin-backend/CHANGELOG.md b/vendor/cloudflare/cloudflare-plugin-backend/CHANGELOG.md
@@ -2,8 +2,15 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.0](#2.0.0) - 2017-03-08
+### Changed
+- Reverted `CF\API\AbstractAPIClient` to Guzzle 5 [#35](https://github.com/cloudflare/cloudflare-plugin-backend/pull/35)
+
+### Fixed
+- API Clients must be instantiated outside `RequestRouter` now to fix DI issue in Magento [#36](https://github.com/cloudflare/cloudflare-plugin-backend/pull/36)
+
 ## [1.1.13](#1.1.13) - 2017-02-28
-### Added 
+### Added
 - Travis CI [#34](https://github.com/cloudflare/cloudflare-plugin-backend/pull/34)
 
 ### Fixed

diff --git a/vendor/cloudflare/cloudflare-plugin-backend/composer.json b/vendor/cloudflare/cloudflare-plugin-backend/composer.json
@@ -2,7 +2,7 @@
   "name": "cloudflare/cloudflare-plugin-backend",
   "description": "A PHP backend for Cloudflare plugins.",
   "license": "BSD-3-Clause",
-  "version": "1.1.13",
+  "version": "2.0.0",
   "scripts": {
     "test": "vendor/bin/phpunit",
     "lint": "vendor/bin/phpcs -n --standard=PSR2 --extensions=php src/",
@@ -14,7 +14,7 @@
   "require-dev": {
     "phpunit/phpunit": "4.8.*",
     "squizlabs/php_codesniffer": "2.*",
-    "guzzle/guzzle": "~3.9"
+    "guzzlehttp/guzzle": "~5.0"
   },
   "autoload": {
     "psr-4": {