Merge pull request doctrine#519 from danmarinescu79/master

using https for YumController
gencer · Jan 13, 2017 · 74376f1 · 74376f1
2 parents 4d0412e + 20f8eff
commit 74376f1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/DoctrineORMModule/Yuml/YumlController.php b/src/DoctrineORMModule/Yuml/YumlController.php
@@ -19,9 +19,9 @@
 
 namespace DoctrineORMModule\Yuml;
 
-use Zend\Mvc\Controller\AbstractActionController;
 use Zend\Http\Client;
 use Zend\Http\Request;
+use Zend\Mvc\Controller\AbstractActionController;
 
 /**
  * Utility to generate Yuml compatible strings from metadata graphs
@@ -57,7 +57,7 @@ public function indexAction()
         /* @var $request \Zend\Http\Request */
         $request = $this->getRequest();
         $this->httpClient->setMethod(Request::METHOD_POST);
-        $this->httpClient->setParameterPost(array('dsl_text' => $request->getPost('dsl_text')));
+        $this->httpClient->setParameterPost(['dsl_text' => $request->getPost('dsl_text')]);
         $response = $this->httpClient->send();
 
         if (!$response->isSuccess()) {
@@ -67,6 +67,6 @@ public function indexAction()
         /* @var $redirect \Zend\Mvc\Controller\Plugin\Redirect */
         $redirect = $this->plugin('redirect');
 
-        return $redirect->toUrl('http://yuml.me/' . $response->getBody());
+        return $redirect->toUrl('https://yuml.me/' . $response->getBody());
     }
 }
diff --git a/src/DoctrineORMModule/Yuml/YumlControllerFactory.php b/src/DoctrineORMModule/Yuml/YumlControllerFactory.php
@@ -71,7 +71,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
         }
 
         return new YumlController(
-            new Client('http://yuml.me/diagram/plain/class/', ['timeout' => 30])
+            new Client('https://yuml.me/diagram/plain/class/', ['timeout' => 30])
         );
     }
 }
diff --git a/tests/DoctrineORMModuleTest/Yuml/YumlControllerTest.php b/tests/DoctrineORMModuleTest/Yuml/YumlControllerTest.php
@@ -83,7 +83,7 @@ public function testIndexActionWillRedirectToYuml()
         $redirect
             ->expects($this->any())
             ->method('toUrl')
-            ->with('http://yuml.me/short-url')
+            ->with('https://yuml.me/short-url')
             ->will($this->returnValue($controllerResponse));
 
         $this->assertSame($controllerResponse, $this->controller->indexAction());