handle parsing files not in the current working directory that have p…

…roto imports within the same directory
basho · May 11, 2016 · ec72927 · ec72927
1 parent e8686ec
commit ec72927
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/ProtobufCompiler/ProtobufParser.php b/ProtobufCompiler/ProtobufParser.php
@@ -977,8 +977,8 @@ private function _parseMessageType(
                     );
                 }
 
-                $includedFilename = $matches[1][0];
-
+                // use dirname to get absolute path in case file parsed is not in cwd
+                $includedFilename = dirname($file->getName()) . DIRECTORY_SEPARATOR . $matches[1][0];
                 if (!file_exists($includedFilename)) {
                     throw new Exception(
                         'Included file ' . $includedFilename . ' does not exist'
@@ -1151,8 +1151,7 @@ private function _resolveMessageFieldTypes(
                     continue;
                 }
 
-                $exists = $this->_namespaces[$file->getPackage()]
-                    [$field->getType()];
+                $exists = $this->_namespaces[$file->getPackage()][$field->getType()];
 
                 if (isset($exists)) {