Merge branch 'main' into renovate/shivammathur-setup-php-digest

GoogleCloudPlatform · Jan 3, 2025 · 45a642a · 45a642a
2 parents e767dc5 + 3725df5
commit 45a642a
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -21,6 +21,6 @@ jobs:
 
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: PHP-CS-Fixer
-      uses: docker://oskarstark/php-cs-fixer-ga:latest@sha256:b9b4d3b392a37371332a452d0ff2891bf4971b57ddb2b52b8a7fac31d87f4dae
+      uses: docker://oskarstark/php-cs-fixer-ga:latest@sha256:a4dc1c964e0f4118aef8ba80ee329157cf1e857e70f4cd1efdc22856887c1d14
       with:
         args: . --diff --dry-run
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ vendor/
 .idea/
 /.php_cs.cache
 *.iml
-.phpunit.result.cache
+.phpunit.result.cache
+.php-cs-fixer.cache
diff --git a/examples/hello/index.php b/examples/hello/index.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2019 Google LLC.
  *

diff --git a/src/Context.php b/src/Context.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2019 Google LLC.
  *

diff --git a/src/Emitter.php b/src/Emitter.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2019 Google LLC.
  *

diff --git a/src/FunctionValidationTrait.php b/src/FunctionValidationTrait.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2023 Google LLC.
  *

diff --git a/src/FunctionWrapper.php b/src/FunctionWrapper.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2019 Google LLC.
  *

diff --git a/src/HttpFunctionWrapper.php b/src/HttpFunctionWrapper.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2019 Google LLC.
  *

diff --git a/src/LegacyEventMapper.php b/src/LegacyEventMapper.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2020 Google LLC.
  *

diff --git a/src/ProjectContext.php b/src/ProjectContext.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2021 Google LLC.
  *

diff --git a/tests/ContextTest.php b/tests/ContextTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2019 Google LLC.
  *

diff --git a/tests/EmitterTest.php b/tests/EmitterTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2020 Google LLC.
  *
@@ -23,7 +24,6 @@
 
 /**
  * @group gcf-framework
- * @runClassInSeparateProcess
  */
 class EmitterTest extends TestCase
 {

diff --git a/tests/FunctionsFrameworkTest.php b/tests/FunctionsFrameworkTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2021 Google LLC.
  *

diff --git a/tests/HttpFunctionWrapperTest.php b/tests/HttpFunctionWrapperTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2019 Google LLC.
  *

diff --git a/tests/dockerTest.php b/tests/dockerTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2020 Google LLC.
  *

diff --git a/tests/exampleTest.php b/tests/exampleTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2020 Google LLC.
  *

diff --git a/tests/vendorTest.php b/tests/vendorTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2020 Google LLC.
  *
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     <?php
     /**
      * Copyright 2019 Google LLC.
      *
@@ Expand Down @@