Merge branch 'master' into xdebug

Author: roxblnfk

.run/Acceptance.run.xml

@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Acceptance" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
+    <TestRunner bootstrap_file="$PROJECT_DIR$/tests/bootstrap.php" configuration_file="$PROJECT_DIR$/phpunit.xml.dist" directory="$PROJECT_DIR$/tests/Acceptance" scope="XML" options="--testsuite=Acceptance" />
+    <method v="2" />
+  </configuration>
+</component>

.run/Functional.run.xml

@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Functional" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
+    <TestRunner bootstrap_file="$PROJECT_DIR$/tests/bootstrap.php" configuration_file="$PROJECT_DIR$/phpunit.xml.dist" directory="$PROJECT_DIR$/tests/Functional" scope="XML" options="--testsuite=Functional" />
+    <method v="2" />
+  </configuration>
+</component>

.run/Unit.run.xml

@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Unit" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
+    <TestRunner bootstrap_file="$PROJECT_DIR$/tests/bootstrap.php" configuration_file="$PROJECT_DIR$/phpunit.xml.dist" directory="$PROJECT_DIR$/tests/Functional" scope="XML" options="--testsuite=Unit" />
+    <method v="2" />
+  </configuration>
+</component>

resources/.phpstorm.meta.php/.phpstorm.meta.php

@@ -62,4 +62,8 @@
     override(\Temporal\Client\WorkflowClient::newRunningWorkflowStub(), map([
         '' => type(0),
     ]));
+
+    override(\Temporal\Client\WorkflowStubInterface::getResult(), map([
+        '' => '@',
+    ]));
 }

resources/workflow.meta-storm.xml

@@ -74,5 +74,11 @@
             <collection name="temporal/sdk:activity-class" argument="0" />
             <stopCompletion />
         </classMethod>
+        <classMethod
+            class="\Temporal\Workflow\WorkflowRunInterface"
+            method="getResult"
+            argument="0">
+            <languageInjection language="InjectablePHP" prefix="/** @var " suffix="$_ **/" />
+        </classMethod>
     </definitions>
 </meta-storm>

testing/src/Environment.php

@@ -101,14 +101,18 @@ public function startTemporalServer(
         );
         $this->temporalServerProcess->setTimeout($commandTimeout);
         $this->temporalServerProcess->start();
-        $this->output->writeln('<info>done.</info>');
-        \sleep(1);
+
+        $limit = 1_000_000;
+        while (!$this->temporalServerProcess->isRunning() && $limit > 0) {
+            \usleep($limit -= 1000);
+        }
 
         if (!$this->temporalServerProcess->isRunning()) {
             $this->output->writeln('<error>error</error>');
             $this->output->writeln('Error starting Temporal server: ' . $this->temporalServerProcess->getErrorOutput());
             exit(1);
         }
+        $this->output->writeln('<info>done.</info>');
     }
 
     public function startTemporalTestServer(int $commandTimeout = 10): void
@@ -127,14 +131,18 @@ public function startTemporalTestServer(int $commandTimeout = 10): void
         );
         $this->temporalTestServerProcess->setTimeout($commandTimeout);
         $this->temporalTestServerProcess->start();
-        $this->output->writeln('<info>done.</info>');
-        \sleep(1);
+
+        $limit = 1_000_000;
+        while (!$this->temporalTestServerProcess->isRunning() && $limit > 0) {
+            \usleep($limit -= 1000);
+        }
 
         if (!$this->temporalTestServerProcess->isRunning()) {
             $this->output->writeln('<error>error</error>');
             $this->output->writeln('Error starting Temporal Test server: ' . $this->temporalTestServerProcess->getErrorOutput());
             exit(1);
         }
+        $this->output->writeln('<info>done.</info>');
     }
 
     /**