@@ -17,7 +17,23 @@ jobs:
       uses: shivammathur/setup-php@v2
       with:
         php-version: '8.0'
-    - name: "Install dependencies"
+    - name: Install Dependencies
       run: composer global require "squizlabs/php_codesniffer:3.*"
     - name: Run PHPCS Code Style Checker
       run: ~/.composer/vendor/bin/phpcs --standard=phpcs-ruleset.xml -p
+  staticanalysis:
+    runs-on: ubuntu-latest
+    name: PHPStan Static Analysis
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: '8.1'
+    - name: "Install dependencies"
+      run: |
+        composer --no-interaction --no-ansi --no-progress update
+        composer --no-interaction --no-ansi --no-progress update -d dev
+    - name: Run Static Analysis
+      run: |
+        dev/sh/static-analysis
@@ -67,7 +67,7 @@ jobs:
       run: |
         vendor/bin/phpunit -c phpunit-snippets.xml.dist --verbose
 
-  test_package:
+  test_packages:
     name: Package Tests
     runs-on: ubuntu-latest
     steps:
 
@@ -24,26 +24,38 @@
  * This file can be removed once a fix is implemented in the protobuf library
  * @see https://github.com/protocolbuffers/protobuf/issues/11649
  */
-namespace GPBMetadata\Google\Protobuf;
+namespace GPBMetadata\Google\Protobuf {
 
-class DescriptorFix
-{
-    public static $is_initialized = false;
+    class DescriptorFix
+    {
+        public static $is_initialized = false;
 
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
+        public static function initOnce() {
+            $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
 
-        if (static::$is_initialized == true) {
-          return;
-        }
+            if (static::$is_initialized == true) {
+            return;
+            }
 
-        if ($pool instanceof \Google\Protobuf\Internal\DescriptorPool) {
-            // add a no-op reference for "google.protobuf.DescriptorProto"
-            $pool->addMessage('google.protobuf.DescriptorProto', \Google\Protobuf\Internal\Message::class)->finalizeToPool();
+            if ($pool instanceof \Google\Protobuf\Internal\DescriptorPool) {
+                // add a no-op reference for "google.protobuf.DescriptorProto"
+                $pool->addMessage('google.protobuf.DescriptorProto', \Google\Protobuf\DescriptorProto::class)->finalizeToPool();
+            }
+            static::$is_initialized = true;
         }
-        static::$is_initialized = true;
     }
+
+    DescriptorFix::initOnce();
 }
 
-DescriptorFix::initOnce();
+namespace Google\Protobuf {
+
+    class DescriptorProto
+    {
+        public function __construct()
+        {
+            throw new \LogicException('Proto2 classes are not supported');
+        }
+    }
+}
 
@@ -233,6 +233,8 @@ private function detectProjectId(array $config)
                 'and we were unable to detect a default project ID.'
             );
         }
+
+        return '';
     }
 
     /**
 
@@ -238,6 +238,8 @@ private function formatValueForApi($value)
 
                 return ['list_value' => $this->formatListForApi($value)];
         }
+
+        return [];
     }
 
     /**
 
@@ -21,6 +21,7 @@
 
 /**
  * Symfony lock component adapter.
+ * @deprecated
  */
 class SymfonyLockAdapter implements LockInterface
 {
 
@@ -48,8 +48,6 @@
     '')
 
 
-
-
 ### [START] protoc backwards compatibility fixes
 
 # roll back to private properties.
 
@@ -415,7 +415,10 @@ function ($collectionId) {
      */
     protected function batchFactory()
     {
-        return new WriteBatch(
+        if (!class_exists(WriteBatch::class)) {
+            class_alias(BulkWriter::class, WriteBatch::class);
+        }
+        return new BulkWriter(
             $this->connection,
             $this->valueMapper,
             $this->databaseFromName($this->name)
 
@@ -175,7 +175,10 @@ public function __construct(array $config = [])
      */
     public function batch()
     {
-        return new WriteBatch(
+        if (!class_exists(WriteBatch::class)) {
+            class_alias(BulkWriter::class, WriteBatch::class);
+        }
+        return new BulkWriter(
             $this->connection,
             $this->valueMapper,
             $this->databaseName(
 
@@ -42,9 +42,10 @@
 # Fix missing formatting method
 s.replace(
     'src/V1/Gapic/CloudSchedulerGapicClient.php',
-    r"private static \$jobNameTemplate;\n\s{4}private static \$locationNameTemplate;",
+    r"private static \$jobNameTemplate;\n\n\s{4}private static \$locationNameTemplate;",
     """private static $jobNameTemplate;
     private static $locationNameTemplate;
+
     private static $projectNameTemplate;"""
 )
 s.replace(
Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,8 @@ private function detectProjectId(array $config)`
`233`	`233`	`'and we were unable to detect a default project ID.'`
`234`	`234`	`);`
`235`	`235`	`}`
	`236`	`+`
	`237`	`+ return '';`
`236`	`238`	`}`
`237`	`239`
`238`	`240`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,8 @@ private function formatValueForApi($value)`
`238`	`238`
`239`	`239`	`return ['list_value' => $this->formatListForApi($value)];`
`240`	`240`	`}`
	`241`	`+`
	`242`	`+ return [];`
`241`	`243`	`}`
`242`	`244`
`243`	`245`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`
`22`	`22`	`/**`
`23`	`23`	`* Symfony lock component adapter.`
	`24`	`+ * @deprecated`
`24`	`25`	`*/`
`25`	`26`	`class SymfonyLockAdapter implements LockInterface`
`26`	`27`	`{`