DocBlocks for services don't use absolute namespaces

README.md

@@ -83,8 +83,8 @@ $data = $book->serialize($codec);
 
 Install with Pear
 
-    pear channel-discover pear.pollinimini.net
-    pear install drslump/Protobuf-beta
+    rake pear:package version=1.0
+    [sudo] pear install Protobuf-1.0.tgz
 
 You can also get the latest version by checking out a copy of the
 repository in your computer.

composer.json

@@ -1,8 +1,8 @@
 {
-    "name": "DrSlump/Protobuf-PHP",
+    "name": "stanley-cheung/protobuf-php",
     "description": "PHP implementation of Google's Protocol Buffers",
     "keywords": ["protobuf", "protocol buffer", "serializing"],
-    "homepage": "https://github.com/drslump/Protobuf-PHP",
+    "homepage": "https://github.com/stanley-cheung/Protobuf-PHP",
     "type": "library",
     "license": "MIT",
     "authors": [
@@ -21,7 +21,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0"
+            "dev-master": "1.0-dev"
         }
     }
 }

library/DrSlump/Protobuf/Compiler.php

@@ -208,4 +208,3 @@ public function getComment($ident, $prefix = '')
         return $comment;
     }
 }
-

library/DrSlump/Protobuf/Compiler/Cli.php

@@ -51,12 +51,12 @@ public static function run($pluginExecutable)
         // We have data from stdin so compile it
         try {
             // Create a compiler interface
-            $comp = new Protobuf\Compiler();
+            $comp = new Protobuf\Compiler(true);
             echo $comp->compile($stdin);
             exit(0);
         } catch(\Exception $e) {
-            fputs(STDERR, 'ERROR: ' . $e->getMessage());
-            fputs(STDERR, $e->getTraceAsString());
+            fputs(STDERR, 'ERROR: ' . $e->getMessage() . PHP_EOL);
+            fputs(STDERR, $e->getTraceAsString() . PHP_EOL);
             exit(255);
         }
     }

library/DrSlump/Protobuf/Compiler/PhpGenerator.php

@@ -82,6 +82,10 @@ public function generate(proto\FileDescriptorProto $proto)
                 $this->addComponent($namespace, $service->getName(), $src);
             }
         endif;
+        foreach($proto->getServiceList() as $service) {
+          $src = $this->compileStub($service, $namespace);
+          $this->addComponent($namespace, $service->getName() . 'Client', $src);
+        }
 
         // Collect extensions
         if ($proto->hasExtension()) {
@@ -409,6 +413,92 @@ protected function compileService(proto\ServiceDescriptorProto $service, $ns)
         return implode(PHP_EOL, $s) . PHP_EOL;
     }
 
+    protected function compileStub(proto\ServiceDescriptorProto $service, $ns){
+      $s = array();
+      $s[] = 'namespace ' . $this->normalizeNS($ns) . ' {';
+      $s[] = '';
+      $s[]= "  // @@protoc_insertion_point(scope_namespace)";
+      $s[]= "  // @@protoc_insertion_point(namespace_$ns)";
+      $s[]= '';
+
+      $cmt = $this->compiler->getComment($ns . '.' . $service->getName(), '   * ');
+      if($cmt){
+        $s[]= "  /**";
+        $s[]= $cmt;
+        $s[]= "   */";
+      }
+      $s[] = '  class ' . $service->getName() . 'Client extends \Grpc\BaseStub {';
+      $s[] = '';
+      $s[] = '    public function __construct($hostname, $opts, $channel = null) {';
+      $s[] = '      parent::__construct($hostname, $opts, $channel);';
+      $s[] = '    }';
+
+      foreach ($service->getMethodList() as $method){
+        $ns_input = $this->normalizeNS($method->getInputType());
+        $ns_output = $this->normalizeNS($method->getOutputType());
+        $s[]= '    /**';
+
+        $cmt = $this->compiler->getComment($ns . '.' . $service->getName() . '.' . $method->getName(), '     * ');
+        if ($cmt){
+          $s[]= $cmt;
+          $s[]= '     * ';
+        }
+
+        $server_stream = $method->getServerStreaming();
+        $client_stream = $method->getClientStreaming();
+
+        // Attach appropriate param/return types
+        if (! $client_stream) {
+          $s[]= '     * @param \\' . $ns_input . ' $argument';
+        }
+
+        if ($client_stream || $server_stream) {
+          $s[]= '     * @param array $metadata';
+          $s[]= '     * @param array $options';
+        }
+
+        if ($client_stream) {
+          if ($server_stream) {
+            $s[]= '     * @return \Grpc\BidiStreamingCall' ;
+          } else {
+            $s[]= '     * @return \Grpc\ClientStreamingCall' ;
+          }
+        } else {
+          if ($server_stream) {
+            $s[]= '     * @return \Grpc\ServerStreamingCall' ;
+          } else {
+            $s[]= '     * @return \\' . $ns_output;
+          }
+        }
+
+        $s[]= '     */';
+
+        $service_fqn = $ns . '.' . $service->getName();
+        if($client_stream){
+          if($server_stream){
+            $s[]= '    public function ' . $method->getName() . '($metadata = array(), $options = array()) {';
+            $s[]= '      return $this->_bidiRequest(\'/' . $service_fqn . '/' . $method->getName() . '\', \'\\' . $ns_output . '::deserialize\', $metadata, $options);';
+          } else {
+            $s[]= '    public function ' . $method->getName() . '($metadata = array(), $options = array()) {';
+            $s[]= '      return $this->_clientStreamRequest(\'/' . $service_fqn . '/' . $method->getName() . '\', \'\\' . $ns_output . '::deserialize\', $metadata, $options);';
+          }
+        } else {
+          if($server_stream){
+            $s[]= '    public function ' . $method->getName() . '($argument, $metadata = array(), $options = array()) {';
+            $s[]= '      return $this->_serverStreamRequest(\'/' . $service_fqn . '/' . $method->getName() . '\', $argument, \'\\' . $ns_output . '::deserialize\', $metadata, $options);';
+          } else {
+            $s[]= '    public function ' . $method->getName() . '(\\' . $ns_input . ' $argument, $metadata = array(), $options = array()) {';
+            $s[]= '      return $this->_simpleRequest(\'/' . $service_fqn . '/' . $method->getName() . '\', $argument, \'\\' . $ns_output . '::deserialize\', $metadata, $options);';
+          }
+        }
+        $s[]= '    }';
+      }
+      $s[]= '  }';
+      $s[]= '}';
+
+      return implode(PHP_EOL, $s) . PHP_EOL;
+    }
+
     protected function generatePublicField(proto\FieldDescriptorProto $field, $ns, $indent)
     {
         $cmt = $this->compiler->getComment($ns . '.' . $field->getNumber(), "$indent * ");