fix: build issues

examples/php/sonar-project.properties

@@ -3,5 +3,6 @@ sonar.projectName=twilio-oai-generator-php
 sonar.organization=twilio
 sonar.sources=src
 sonar.tests=tests
+sonar.exclusions=Api.php,Client.php,FlexApi.php,Versionless.php
 sonar.php.coverage.reportPaths=php_coverage.xml
 sonar.php.tests.reportPath=execution-result.xml

examples/php/src/Twilio/Rest/Api/V2010/Account/CallContext.php

@@ -30,6 +30,9 @@
 use Twilio\Rest\Api\V2010\Account\Call\FeedbackCallSummaryList;
 
 
+/**
+ * @method \Twilio\Rest\Api\V2010\Account\Call\FeedbackCallSummaryContext feedbackCallSummary(string $sid)
+ */
 
 class CallContext extends InstanceContext {
     /**
@@ -75,6 +78,39 @@ public function fetch(): CallInstance {
         );
     }
 
+    /**
+     * Magic getter to lazy load subresources
+     *
+     * @param string $name Subresource to return
+     * @return ListResource The requested subresource
+     * @throws TwilioException For unknown subresources
+     */
+    public function __get(string $name): ListResource {
+        if (\property_exists($this, '_' . $name)) {
+            $method = 'get' . \ucfirst($name);
+            return $this->$method();
+        }
+
+        throw new TwilioException('Unknown subresource ' . $name);
+    }
+
+    /**
+     * Magic caller to get resource contexts
+     *
+     * @param string $name Resource to return
+     * @param array $arguments Context parameters
+     * @return InstanceContext The requested resource context
+     * @throws TwilioException For unknown resource
+     */
+    public function __call(string $name, array $arguments): InstanceContext {
+        $property = $this->$name;
+        if (\method_exists($property, 'getContext')) {
+            return \call_user_func_array(array($property, 'getContext'), $arguments);
+        }
+
+        throw new TwilioException('Resource does not have a context');
+    }
+
     /**
      * Provide a friendly representation
      *

examples/php/src/Twilio/Rest/Api/V2010/Account/CallList.php

@@ -31,7 +31,6 @@
 
 /**
  * @property FeedbackCallSummaryList $feedbackCallSummary
- * @method \Twilio\Rest\Api\V2010\Account\Call\FeedbackCallSummaryContext feedbackCallSummary(string $sid)
  */
 
 class CallList extends ListResource {

src/main/java/com/twilio/oai/TwilioPhpGenerator.java

@@ -55,7 +55,9 @@ public String apiFilename(final String templateName, final String tag) {
     @Override
     public String toApiFilename(final String name) {
 
-        return directoryStructureService.toApiFilename(super.toApiFilename(name));
+        String apiFileName = directoryStructureService.toApiFilename(super.toApiFilename(name));
+        apiFileName = apiFileName.replaceAll("/Function/", "/TwilioFunction/");
+        return apiFileName;
     }
 
     @Override

src/main/java/com/twilio/oai/api/PhpApiResourceBuilder.java

@@ -13,6 +13,7 @@
 import java.util.stream.Collectors;
 import java.util.regex.*;
 import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
 import static com.twilio.oai.common.ApplicationConstants.PATH_SEPARATOR_PLACEHOLDER;
 
@@ -66,7 +67,10 @@ public IApiResourceBuilder updateApiPath() {
     public ApiResourceBuilder setImports(DirectoryStructureService directoryStructureService) {
         codegenOperationList.stream().forEach(operation -> {
             if (!pathSet.contains(operation.path)) {
-                List<Resource> dependents = directoryStructureService.getResourceTree().dependents(operation.path);
+                List<Resource> dependents = StreamSupport.stream(directoryStructureService.getResourceTree().getResources().spliterator(), false)
+                        .filter(resource -> PathUtils.removeFirstPart(operation.path).equals(PathUtils.getTwilioExtension(resource.getPathItem(), "parent").orElse(null)))
+                        .collect(Collectors.toList());
+
                 List<Resource> methodDependents = dependents.stream().filter(dep ->
                                 PathUtils.getTwilioExtension(dep.getPathItem(), "pathType").get().equals("instance"))
                         .collect(Collectors.toList());
@@ -98,6 +102,13 @@ private static void updateDependents(DirectoryStructureService directoryStructur
                         opr)));
         resourceList.stream().filter(dependent -> dependent.getPathItem().readOperations().isEmpty()).
                 forEach(dep -> directoryStructureService.addContextdependents(dependentList, dep.getName(), null));
+
+        dependentList.stream().map(DirectoryStructureService.ContextResource.class::cast)
+                .map(contextResource -> {
+                    if (contextResource.getParent().matches("(.*)Function\\\\(.*)"))
+                        contextResource.setParent(contextResource.getParent().replaceAll("\\\\Function\\\\", "\\\\TwilioFunction\\\\"));
+                    return (Object) contextResource;
+                }).collect(Collectors.toList());
     }
 
     private String formatPath(String path) {
@@ -130,6 +141,8 @@ private void updateNamespaceSubPart(CodegenOperation codegenOperation) {
                     .collect(Collectors.joining("\\"));
             namespaceSubPart = "\\" + namespacePath;
         }
+        namespaceSubPart = namespaceSubPart.replaceAll("\\\\Function$", "\\\\TwilioFunction");
+        namespaceSubPart = namespaceSubPart.replaceAll("\\\\Function[\\\\]", "\\\\TwilioFunction\\\\");
     }
 
     @Override

src/main/resources/twilio-php/context.mustache

@@ -80,41 +80,12 @@ class {{apiName}}Context extends InstanceContext {
     }
 
     {{/metaProperties.contextImportProperties}}
-    {{#metaProperties.contextImportProperties.0}}
-    /**
-     * Magic getter to lazy load subresources
-     *
-     * @param string $name Subresource to return
-     * @return ListResource The requested subresource
-     * @throws TwilioException For unknown subresources
-     */
-    public function __get(string $name): ListResource {
-        if (\property_exists($this, '_' . $name)) {
-            $method = 'get' . \ucfirst($name);
-            return $this->$method();
-        }
-
-        throw new TwilioException('Unknown subresource ' . $name);
-    }
-
-    /**
-     * Magic caller to get resource contexts
-     *
-     * @param string $name Resource to return
-     * @param array $arguments Context parameters
-     * @return InstanceContext The requested resource context
-     * @throws TwilioException For unknown resource
-     */
-    public function __call(string $name, array $arguments): InstanceContext {
-        $property = $this->$name;
-        if (\method_exists($property, 'getContext')) {
-            return \call_user_func_array(array($property, 'getContext'), $arguments);
-        }
-
-        throw new TwilioException('Resource does not have a context');
-    }
-
-    {{/metaProperties.contextImportProperties.0}}
+{{#metaProperties.contextImportProperties.0}}{{>magicGetterandCaller}}
+{{/metaProperties.contextImportProperties.0}}
+{{^metaProperties.contextImportProperties.0}}
+{{#metaProperties.contextImportMethods.0}}{{>magicGetterandCaller}}
+{{/metaProperties.contextImportMethods.0}}
+{{/metaProperties.contextImportProperties.0}}
     /**
      * Provide a friendly representation
      *

src/main/resources/twilio-php/list.mustache

@@ -101,41 +101,12 @@ class {{apiName}}List extends ListResource {
     }
 
     {{/metaProperties.listImportProperties}}
-    {{#metaProperties.listImportProperties.0}}
-    /**
-     * Magic getter to lazy load subresources
-     *
-     * @param string $name Subresource to return
-     * @return ListResource The requested subresource
-     * @throws TwilioException For unknown subresources
-     */
-    public function __get(string $name): ListResource {
-        if (\property_exists($this, '_' . $name)) {
-            $method = 'get' . \ucfirst($name);
-            return $this->$method();
-        }
-
-        throw new TwilioException('Unknown subresource ' . $name);
-    }
-
-    /**
-     * Magic caller to get resource contexts
-     *
-     * @param string $name Resource to return
-     * @param array $arguments Context parameters
-     * @return InstanceContext The requested resource context
-     * @throws TwilioException For unknown resource
-     */
-    public function __call(string $name, array $arguments): InstanceContext {
-        $property = $this->$name;
-        if (\method_exists($property, 'getContext')) {
-            return \call_user_func_array(array($property, 'getContext'), $arguments);
-        }
-
-        throw new TwilioException('Resource does not have a context');
-    }
-
-    {{/metaProperties.listImportProperties.0}}
+{{#metaProperties.listImportProperties.0}}{{>magicGetterandCaller}}
+{{/metaProperties.listImportProperties.0}}
+{{^metaProperties.listImportProperties.0}}
+{{#metaProperties.listImportMethods.0}}{{>magicGetterandCaller}}
+{{/metaProperties.listImportMethods.0}}
+{{/metaProperties.listImportProperties.0}}
     /**
      * Provide a friendly representation
      *

src/main/resources/twilio-php/magicGetterandCaller.mustache

@@ -0,0 +1,32 @@
+    /**
+     * Magic getter to lazy load subresources
+     *
+     * @param string $name Subresource to return
+     * @return ListResource The requested subresource
+     * @throws TwilioException For unknown subresources
+     */
+    public function __get(string $name): ListResource {
+        if (\property_exists($this, '_' . $name)) {
+            $method = 'get' . \ucfirst($name);
+            return $this->$method();
+        }
+
+        throw new TwilioException('Unknown subresource ' . $name);
+    }
+
+    /**
+     * Magic caller to get resource contexts
+     *
+     * @param string $name Resource to return
+     * @param array $arguments Context parameters
+     * @return InstanceContext The requested resource context
+     * @throws TwilioException For unknown resource
+     */
+    public function __call(string $name, array $arguments): InstanceContext {
+        $property = $this->$name;
+        if (\method_exists($property, 'getContext')) {
+            return \call_user_func_array(array($property, 'getContext'), $arguments);
+        }
+
+        throw new TwilioException('Resource does not have a context');
+    }