Merge branch 'master' into ace-n-patch-2

Author: bshaffer

.kokoro/secrets-example.sh

@@ -60,6 +60,11 @@ export POSTGRES_DSN=
 export POSTGRES_DATABASE=
 export POSTGRES_USER=
 export POSTGRES_PASSWORD=
+export SQLSERVER_DSN=
+export SQLSERVER_DATABASE=
+export SQLSERVER_USER=
+export SQLSERVER_PASSWORD=
+export DB_SOCKET_DIR=
 
 # Datastore
 export CLOUD_DATASTORE_NAMESPACE=

.kokoro/secrets.sh.enc

@@ -16,6 +16,22 @@
         'return_type_declaration' => [
             'space_before' => 'none'
         ],
+        // only converts simple strings in double quotes to single quotes
+        // ignores strings using variables, escape characters or single quotes inside
+        'single_quote' => true,
+        // there should be a single space b/w the cast and it's operand
+        'cast_spaces' => ['space' => 'single'],
+        // there shouldn't be any trailing whitespace at the end of a non-blank line
+        'no_trailing_whitespace' => true,
+        // there shouldn't be any trailing whitespace at the end of a blank line
+        'no_whitespace_in_blank_line' => true,
+        // there should be a space around binary operators like (=, => etc)
+        'binary_operator_spaces' => ['default' => 'single_space'],
+        // deals with rogue empty blank lines
+        'no_extra_blank_lines' => ['tokens' => ['extra']],
+        // reduces multi blank lines b/w phpdoc description and @param to a single line
+        // NOTE: Doesn't add a blank line if none exist
+        'phpdoc_trim_consecutive_blank_line_separation' => true,
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()

.php-cs-fixer.dist.php

@@ -1,5 +1,5 @@
 {
     "require": {
-        "google/analytics-data": "^0.5.0"
+        "google/analytics-data": "^0.7.0"
     }
 }

analyticsdata/composer.json

@@ -43,7 +43,6 @@
  */
 $property_id = 'YOUR-GA4-PROPERTY-ID';
 
-
 // [START analyticsdata_json_credentials_initialize]
 /* TODO(developer): Replace this variable with a valid path to the
  *  credentials.json file for your service account downloaded from the

analyticsdata/quickstart_json_credentials.php

@@ -1,6 +1,6 @@
 {
     "require": {
-        "google/analytics-data": "^0.5.0",
+        "google/analytics-data": "^0.7.0",
         "ext-bcmath":  "*"
     }
 }

analyticsdata/quickstart_oauth2/composer.json

@@ -72,7 +72,7 @@
             $entity['user_ip']);
     }
     # [END gae_flex_datastore_query]
-    array_unshift($visits, "Last 10 visits:");
+    array_unshift($visits, 'Last 10 visits:');
     $response->getBody()->write(implode("\n", $visits));
 
     return $response

appengine/flexible/datastore/app.php

@@ -30,6 +30,6 @@ public function testIndex()
         $this->assertEquals('200', $resp->getStatusCode(),
             'top page status code');
 
-        $this->assertStringContainsString("Last 10 visits:", (string) $resp->getBody());
+        $this->assertStringContainsString('Last 10 visits:', (string) $resp->getBody());
     }
 }

appengine/flexible/datastore/test/DeployTest.php

@@ -33,6 +33,6 @@ public function testIndex()
         $response = $app->handle($request);
         $this->assertEquals(200, $response->getStatusCode());
         $text = (string) $response->getBody();
-        $this->assertStringContainsString("Last 10 visits:", $text);
+        $this->assertStringContainsString('Last 10 visits:', $text);
     }
 }

appengine/flexible/datastore/test/LocalTest.php

@@ -41,7 +41,7 @@ public function testIndex()
         $this->assertEquals('200', $resp->getStatusCode(),
             'top page status code');
 
-        $this->assertStringContainsString("Logs:", (string) $resp->getBody());
+        $this->assertStringContainsString('Logs:', (string) $resp->getBody());
     }
     public function testAsyncLog()
     {

appengine/flexible/logging/test/DeployTest.php

@@ -33,7 +33,7 @@ public function testSomeLogs()
 
         $this->assertEquals(200, $response->getStatusCode());
         $text = (string) $response->getBody();
-        $this->assertStringContainsString("Logs:", $text);
+        $this->assertStringContainsString('Logs:', $text);
     }
 
     public function testAsyncLog()

appengine/flexible/logging/test/LocalTest.php

@@ -50,10 +50,10 @@ public function testIndex()
         $key = rand(0, 1000);
 
         // Test the /memcached REST API.
-        $this->put("/memcached/test$key", "sour");
-        $this->assertEquals("sour", $this->get("/memcached/test$key"));
-        $this->put("/memcached/test$key", "sweet");
-        $this->assertEquals("sweet", $this->get("/memcached/test$key"));
+        $this->put("/memcached/test$key", 'sour');
+        $this->assertEquals('sour', $this->get("/memcached/test$key"));
+        $this->put("/memcached/test$key", 'sweet');
+        $this->assertEquals('sweet', $this->get("/memcached/test$key"));
 
         // Make sure it handles a POST request too, which will increment the
         // counter.

appengine/flexible/memcache/test/DeployTest.php

@@ -62,26 +62,26 @@ public function testGetAndPut()
         // Use a random key to avoid colliding with simultaneous tests.
 
         // Test the /memcached REST API.
-        $request1 = (new RequestFactory)->createRequest('PUT', "/memcached/testkey1");
+        $request1 = (new RequestFactory)->createRequest('PUT', '/memcached/testkey1');
         $request1->getBody()->write('sour');
         $response1 = $app->handle($request1);
         $this->assertEquals(200, (string) $response1->getStatusCode());
 
         // Check that the key was written as expected
-        $request2 = (new RequestFactory)->createRequest('GET', "/memcached/testkey1");
+        $request2 = (new RequestFactory)->createRequest('GET', '/memcached/testkey1');
         $response2 = $app->handle($request2);
-        $this->assertEquals("sour", (string) $response2->getBody());
+        $this->assertEquals('sour', (string) $response2->getBody());
 
         // Test the /memcached REST API with a new value.
-        $request3 = (new RequestFactory)->createRequest('PUT', "/memcached/testkey2");
+        $request3 = (new RequestFactory)->createRequest('PUT', '/memcached/testkey2');
         $request3->getBody()->write('sweet');
         $response3 = $app->handle($request3);
         $this->assertEquals(200, (string) $response3->getStatusCode());
 
         // Check that the key was written as expected
-        $request4 = (new RequestFactory)->createRequest('GET', "/memcached/testkey2");
+        $request4 = (new RequestFactory)->createRequest('GET', '/memcached/testkey2');
         $response4 = $app->handle($request4);
-        $this->assertEquals("sweet", (string) $response4->getBody());
+        $this->assertEquals('sweet', (string) $response4->getBody());
     }
 }
 

appengine/flexible/memcache/test/LocalTest.php

@@ -28,7 +28,7 @@
 $app->addErrorMiddleware(true, true, true);
 
 $twilioAccountSid = getenv('TWILIO_ACCOUNT_SID');
-$twilioAuthToken  = getenv('TWILIO_AUTH_TOKEN');
+$twilioAuthToken = getenv('TWILIO_AUTH_TOKEN');
 $twilioNumber = getenv('TWILIO_FROM_NUMBER');
 
 # [START gae_flex_twilio_receive_call]

appengine/flexible/twilio/app.php

@@ -42,7 +42,7 @@ public function onOpen(ConnectionInterface $conn)
 
     public function onMessage(ConnectionInterface $from, $msg)
     {
-        $output = "Message received: " . $msg . "\n";
+        $output = 'Message received: ' . $msg . "\n";
         echo $output;
         foreach ($this->clients as $client) {
             $client->send($output);
@@ -59,7 +59,7 @@ public function onClose(ConnectionInterface $conn)
     public function onError(ConnectionInterface $conn, \Exception $e)
     {
         $conn->close();
-        echo "Connection closed due to error: " . $e->getMessage() . "\n";
+        echo 'Connection closed due to error: ' . $e->getMessage() . "\n";
         echo "\t" . $this->clients->count() . " connection(s) active.\n";
     }
 }

appengine/flexible/websockets/socket-demo.php

@@ -54,14 +54,14 @@ public function testIndex()
                 return $endPromise;
             })
             ->otherwise(function ($e) {
-                echo "Error: " . $e->getMessage() . "\n";
+                echo 'Error: ' . $e->getMessage() . "\n";
                 throw $e;
             });
 
         $this->loop->run();
         $resolvedMsg = Block\await($basePromise, $this->loop);
         $this->assertStringContainsString(
-            "Message received: Hello World!",
+            'Message received: Hello World!',
             strval($resolvedMsg)
         );
     }

appengine/flexible/websockets/test/LocalTest.php

@@ -97,7 +97,7 @@
  * You can have multiple installations in one database if you give each
  * a unique prefix. Only numbers, letters, and underscores please!
  */
-$table_prefix  = 'wp_';
+$table_prefix = 'wp_';
 
 /**
  * For developers: WordPress debugging mode.

appengine/flexible/wordpress/files/wp-config.php

@@ -43,7 +43,7 @@ function throwException()
             print('Triggering a PHP Fatal Error by including a file with a syntax error.');
             print($linkText);
             $filename = tempnam(sys_get_temp_dir(), 'php_syntax_error');
-            file_put_contents($filename, "");
+            file_put_contents($filename, '');
             require($filename);
             break;
         default:

appengine/standard/errorreporting/index.php

@@ -0,0 +1,49 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+#   $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+
+# PHP Composer dependencies:
+/vendor/
+
+# Files from phpize
+ext/Makefile.global
+ext/acinclude.m4
+ext/aclocal.m4
+ext/autom4te.cache/
+ext/config.guess
+ext/config.h.in
+ext/config.sub
+ext/configure
+ext/configure.ac
+ext/install-sh
+ext/ltmain.sh
+ext/missing
+ext/mkinstalldirs
+ext/run-tests.php
+
+# Files from ./configure
+ext/Makefile
+ext/Makefile.fragments
+ext/Makefile.objects
+ext/config.h
+ext/config.log
+ext/config.nice
+ext/config.status
+ext/libtool
+
+# Files from make
+ext/.libs/
+ext/modules/
+ext/*.la
+ext/*.lo

appengine/standard/extensions/.gcloudignore

@@ -0,0 +1,31 @@
+# Files from phpize
+ext/Makefile.global
+ext/acinclude.m4
+ext/aclocal.m4
+ext/autom4te.cache/
+ext/config.guess
+ext/config.h.in
+ext/config.sub
+ext/configure
+ext/configure.ac
+ext/install-sh
+ext/ltmain.sh
+ext/missing
+ext/mkinstalldirs
+ext/run-tests.php
+
+# Files from ./configure
+ext/Makefile
+ext/Makefile.fragments
+ext/Makefile.objects
+ext/config.h
+ext/config.log
+ext/config.nice
+ext/config.status
+ext/libtool
+
+# Files from make
+ext/.libs/
+ext/modules/
+ext/*.la
+ext/*.lo

appengine/standard/extensions/.gitignore

@@ -0,0 +1 @@
+runtime: php74

appengine/standard/extensions/app.yaml

@@ -0,0 +1,8 @@
+{
+    "scripts": {
+        "post-autoload-dump": [
+            "cd ext && phpize --clean && phpize && ./configure && make",
+            "cp ext/modules/my_custom_extension.so vendor/"
+        ]
+    }
+}

appengine/standard/extensions/composer.json

@@ -0,0 +1,5 @@
+PHP_ARG_ENABLE(my_custom_extension, Whether to enable the MyCustomExtension extension, [ --enable-my-custom-extension Enable MyCustomExtension])
+
+if test "$MY_CUSTOM_EXTENSION" != "no"; then
+    PHP_NEW_EXTENSION(my_custom_extension, my_custom_extension.c, $ext_shared)
+fi

appengine/standard/extensions/ext/config.m4

@@ -0,0 +1,34 @@
+// include the PHP API itself
+#include 
+// include the extension header
+#include "my_custom_extension.h"
+
+// register the "helloworld_from_extension" function to the PHP API
+zend_function_entry my_custom_extension_functions[] = {
+    PHP_FE(helloworld_from_extension, NULL)
+    {NULL, NULL, NULL}
+};
+
+// some information about our module
+zend_module_entry my_custom_extension_module_entry = {
+    STANDARD_MODULE_HEADER,
+    PHP_MY_CUSTOM_EXTENSION_EXTNAME,
+    my_custom_extension_functions,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    PHP_MY_CUSTOM_EXTENSION_VERSION,
+    STANDARD_MODULE_PROPERTIES
+};
+
+// use a macro to output additional C code, to make ext dynamically loadable
+ZEND_GET_MODULE(my_custom_extension)
+
+// Implement our "Hello World" function, which returns a string
+PHP_FUNCTION(helloworld_from_extension) {
+    zval val;
+    ZVAL_STRING(&val, "Hello World! (from my_custom_extension.so)\n");
+    RETURN_STR(Z_STR(val));
+}

appengine/standard/extensions/ext/my_custom_extension.c

@@ -0,0 +1,6 @@
+// module constants
+#define PHP_MY_CUSTOM_EXTENSION_EXTNAME "my_custom_extension"
+#define PHP_MY_CUSTOM_EXTENSION_VERSION "0.0.1"
+
+// the function to be exported
+PHP_FUNCTION(helloworld_from_extension);

appengine/standard/extensions/ext/my_custom_extension.h

@@ -0,0 +1,3 @@
+
+
+echo helloworld_from_extension();

appengine/standard/extensions/index.php

@@ -0,0 +1 @@
+extension=/workspace/vendor/my_custom_extension.so