File tree Expand file tree Collapse file tree 1 file changed +0
-25
lines changed
Expand file tree Collapse file tree 1 file changed +0
-25
lines changed Original file line number Diff line number Diff line change @@ -404,8 +404,6 @@ public function testUpdateRecordings(): void
404404 $ this ->assertEquals ('FAILED ' , $ result ->getReturnCode ());
405405 $ this ->assertTrue ($ result ->failed ());
406406 }
407- <<<<<<< HEAD
408- =======
409407
410408 // Hooks: create
411409
@@ -443,27 +441,4 @@ public function testHooksDestroy(): void
443441 $ hooksCreateResponse = $ this ->bbb ->hooksDestroy ($ hooksDestroyParameters );
444442 $ this ->assertFalse ($ hooksCreateResponse ->success (), $ hooksCreateResponse ->getMessage ());
445443 }
446-
447- /**
448- * @see https://github.com/vlucas/phpdotenv
449- */
450- private function loadEnvironmentVariables (): void
451- {
452- $ envPath = __DIR__ . '/.. ' ;
453- $ envFileMain = '.env ' ;
454- $ envFileLocal = '.env.local ' ;
455-
456- if (file_exists ("{$ envPath }/ {$ envFileLocal }" )) {
457- $ envFile = $ envFileLocal ;
458- } elseif (file_exists ("{$ envPath }/ {$ envFileMain }" )) {
459- $ envFile = $ envFileMain ;
460- } else {
461- throw new \RuntimeException ("Environment file (' {$ envFileMain }' nor ' {$ envFileLocal }') not found! " );
462- }
463-
464- $ dotenv = Dotenv::createUnsafeImmutable ($ envPath , $ envFile );
465- $ dotenv ->load ();
466- $ dotenv ->required (['BBB_SECRET ' , 'BBB_SERVER_BASE_URL ' ]);
467- }
468- >>>>>>> master
469444}
You can’t perform that action at this time.
0 commit comments