Regenerate example code

twirphp · May 1, 2018 · cd306a3 · cd306a3
1 parent f72e593
commit cd306a3
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 12 deletions.
diff --git a/example/generated/Twitch/Twirp/Example/Haberdasher.php b/example/generated/Twitch/Twirp/Example/Haberdasher.php
@@ -1,5 +1,5 @@
 <?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Generated by the protocol buffer compiler (protoc-gen-twirp_php master).  DO NOT EDIT!
 # source: service.proto
 
 namespace Twitch\Twirp\Example;

diff --git a/example/generated/Twitch/Twirp/Example/HaberdasherClient.php b/example/generated/Twitch/Twirp/Example/HaberdasherClient.php
@@ -1,5 +1,5 @@
 <?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Generated by the protocol buffer compiler (protoc-gen-twirp_php master).  DO NOT EDIT!
 # source: service.proto
 
 namespace Twitch\Twirp\Example;
@@ -51,7 +51,7 @@ public function MakeHat(array $ctx, \Twitch\Twirp\Example\Size $in)
 
         $out = new \Twitch\Twirp\Example\Hat();
 
-        $url = (string)$this->addr->withPath('/twirp/twitch.twirp.example.Haberdasher/MakeHat');
+        $url = $this->addr.'/twirp/twitch.twirp.example.Haberdasher/MakeHat';
 
         $this->doProtobufRequest($ctx, $url, $in, $out);
 

diff --git a/example/generated/Twitch/Twirp/Example/HaberdasherServer.php b/example/generated/Twitch/Twirp/Example/HaberdasherServer.php
@@ -1,5 +1,5 @@
 <?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Generated by the protocol buffer compiler (protoc-gen-twirp_php master).  DO NOT EDIT!
 # source: service.proto
 
 namespace Twitch\Twirp\Example;

diff --git a/example/generated/Twitch/Twirp/Example/Server.php b/example/generated/Twitch/Twirp/Example/Server.php
@@ -1,5 +1,5 @@
 <?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Generated by the protocol buffer compiler (protoc-gen-twirp_php master).  DO NOT EDIT!
 
 namespace Twitch\Twirp\Example;
 

diff --git a/example/generated/Twitch/Twirp/Example/TwirpClient.php b/example/generated/Twitch/Twirp/Example/TwirpClient.php
@@ -1,5 +1,5 @@
 <?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Generated by the protocol buffer compiler (protoc-gen-twirp_php master).  DO NOT EDIT!
 
 namespace Twitch\Twirp\Example;
 
@@ -267,12 +267,18 @@ final private function isHttpRedirect($status)
      */
     final protected function urlBase($addr)
     {
-        $url = $this->messageFactory->createRequest('POST', $addr)->getUri();
+        $scheme = parse_url($addr, PHP_URL_SCHEME);
 
-        if ($url->getScheme() == '') {
-            $url = $url->withScheme('http');
+        // If parse_url fails, return the addr unchanged.
+        if ($scheme === false) {
+            return $addr;
         }
 
-        return $url;
+        // If the addr does not specify a scheme, default to http.
+        if (empty($scheme)) {
+            $addr = 'http://'.ltrim($addr, ':/');
+        }
+
+        return $addr;
     }
 }
diff --git a/example/generated/Twitch/Twirp/Example/TwirpError.php b/example/generated/Twitch/Twirp/Example/TwirpError.php
@@ -1,5 +1,5 @@
 <?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Generated by the protocol buffer compiler (protoc-gen-twirp_php master).  DO NOT EDIT!
 
 namespace Twitch\Twirp\Example;
 

diff --git a/example/generated/Twitch/Twirp/Example/TwirpServer.php b/example/generated/Twitch/Twirp/Example/TwirpServer.php
@@ -1,5 +1,5 @@
 <?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# Generated by the protocol buffer compiler (protoc-gen-twirp_php master).  DO NOT EDIT!
 
 namespace Twitch\Twirp\Example;