Merge branch 'master' into automl

Author: bshaffer

.github/snippet-bot.yml

@@ -0,0 +1 @@
+

.gitignore

@@ -10,3 +10,4 @@ credentials.*
 .php_cs.cache
 .vscode/
 .kokoro/secrets.sh
+.phpunit.result.cache

.kokoro/docker/php73/Dockerfile

@@ -98,6 +98,9 @@ RUN ln -s /usr/lib/libc-client.a /usr/lib/x86_64-linux-gnu/libc-client.a && \
         php -r "if (hash_file('SHA384', 'composer-setup.php') === rtrim(file_get_contents('https://composer.github.io/installer.sig'))) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
         php composer-setup.php --filename=composer --install-dir=/usr/local/bin
 
+# Install phpunit globally
+RUN composer global require phpunit/phpunit:^7.0
+
 # Install Google Cloud SDK
 RUN curl https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz \
         -o ${HOME}/google-cloud-sdk.tar.gz \
@@ -108,7 +111,7 @@ RUN curl https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz \
         --command-completion false
 
 # Make composer and gcloud bins available via the PATH variable
-ENV PATH="$PATH:/root/google-cloud-sdk/bin:/root/.composer/vendor/bin"
+ENV PATH="$PATH:/root/.composer/vendor/bin:/root/google-cloud-sdk/bin"
 
 # Configure Google Cloud SDK
 RUN gcloud config set app/promote_by_default false && \
@@ -117,3 +120,5 @@ RUN gcloud config set app/promote_by_default false && \
     gcloud -q components install app-engine-php && \
     gcloud -q components update
 
+# Build php-cs-fixer
+RUN composer global require friendsofphp/php-cs-fixer

.kokoro/docker/php74/Dockerfile

@@ -0,0 +1,122 @@
+FROM gcr.io/gcp-runtimes/ubuntu_16_0_4
+ENV PHP_DIR=/opt/php74
+ENV PHP_SRC_DIR=/usr/local/src/php74-build
+ENV PATH=${PATH}:/usr/local/bin:${PHP_DIR}/bin
+
+RUN apt-get update && \
+    apt-get -y install \
+            autoconf \
+            build-essential \
+            git-core \
+            jq \
+            libbz2-dev \
+            libcurl4-openssl-dev \
+            libc-client2007e \
+            libc-client2007e-dev \
+            libfcgi-dev \
+            libfcgi0ldbl \
+            libfreetype6-dev \
+            libicu-dev \
+            libjpeg62-dbg \
+            libjpeg-dev \
+            libkrb5-dev \
+            libmcrypt-dev \
+            libpng12-dev \
+            libpq-dev \
+            libssl-dev \
+            libxml2-dev \
+            libxslt1-dev \
+            libzip-dev \
+            python-ipaddr \
+            wget \
+            zip \
+            zlib1g-dev \
+            pkg-config \
+            sqlite3 \
+            libsqlite3-dev \
+            libonig-dev \
+            php-pear
+
+RUN ln -s /usr/lib/libc-client.a /usr/lib/x86_64-linux-gnu/libc-client.a && \
+    mkdir -p ${PHP_DIR} ${PHP_SRC_DIR} ${PHP_DIR}/lib/conf.d && \
+    cd ${PHP_SRC_DIR} && \
+    wget http://us1.php.net/get/php-7.4.0.tar.bz2/from/this/mirror \
+         -O php-7.4.0.tar.bz2 && \
+    tar jxf php-7.4.0.tar.bz2 && \
+    cd php-7.4.0 && \
+    ./configure \
+        --prefix=${PHP_DIR} \
+        --with-config-file-scan-dir=${PHP_DIR}/lib/conf.d \
+        --with-pdo-pgsql \
+        --with-zlib-dir \
+        --enable-mbstring \
+        --enable-soap \
+        --enable-intl \
+        --enable-calendar \
+        --with-curl \
+        --with-zlib \
+        --with-pgsql \
+        --disable-rpath \
+        --enable-inline-optimization \
+        --with-bz2 \
+        --with-zlib \
+        --enable-sockets \
+        --enable-sysvsem \
+        --enable-sysvshm \
+        --enable-sysvmsg \
+        --enable-pcntl \
+        --enable-mbregex \
+        --enable-exif \
+        --enable-bcmath \
+        --with-mhash \
+        --with-pdo-mysql \
+        --with-mysqli \
+        --with-openssl \
+        --with-fpm-user=www-data \
+        --with-fpm-group=www-data \
+        --with-libdir=/lib/x86_64-linux-gnu \
+        --enable-ftp \
+        --with-imap \
+        --with-imap-ssl \
+        --with-gettext \
+        --with-xmlrpc \
+        --with-xsl \
+        --with-zip \
+        --with-kerberos \
+        --enable-fpm && \
+        make && \
+        make install && \
+        pecl install grpc && \
+        cp php.ini-production ${PHP_DIR}/lib/php.ini && \
+        echo 'zend_extension=opcache.so' >> ${PHP_DIR}/lib/php.ini && \
+        echo 'extension=grpc.so' >> ${PHP_DIR}/lib/conf.d/ext-grpc.ini && \
+        php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
+        php -r "if (hash_file('SHA384', 'composer-setup.php') === rtrim(file_get_contents('https://composer.github.io/installer.sig'))) { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \
+        php composer-setup.php --filename=composer --install-dir=/usr/local/bin
+
+# Remove old version of PHP
+RUN apt purge -y php7.0-common
+
+# Install phpunit globally
+RUN composer global require phpunit/phpunit:^7.0
+
+# Install Google Cloud SDK
+RUN curl https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz \
+        -o ${HOME}/google-cloud-sdk.tar.gz \
+    && tar xzf ${HOME}/google-cloud-sdk.tar.gz -C $HOME \
+    && ${HOME}/google-cloud-sdk/install.sh \
+        --usage-reporting false \
+        --path-update false \
+        --command-completion false
+
+# Make composer and gcloud bins available via the PATH variable
+ENV PATH="$PATH:/root/.composer/vendor/bin:/root/google-cloud-sdk/bin"
+
+# Configure Google Cloud SDK
+RUN gcloud config set app/promote_by_default false && \
+    gcloud config set disable_prompts true && \
+    gcloud -q components install app-engine-python && \
+    gcloud -q components update
+
+# Build php-cs-fixer
+RUN composer global require friendsofphp/php-cs-fixer

.kokoro/php73.cfg

@@ -15,7 +15,3 @@ env_vars: {
     key: "GOOGLE_ALT_CREDENTIALS_FILENAME"
     value: "service-account-kokoro3.json"
 }
-env_vars: {
-    key: "RUN_CS_CHECK"
-    value: "true"
-}

.kokoro/php71.cfg renamed to .kokoro/php74.cfg

@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
     key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/php71"
+    value: "gcr.io/cloud-devrel-kokoro-resources/php74"
 }
 
 # Give the docker image a unique project ID and credentials per PHP version
@@ -15,3 +15,7 @@ env_vars: {
     key: "GOOGLE_ALT_CREDENTIALS_FILENAME"
     value: "service-account-kokoro1.json"
 }
+env_vars: {
+    key: "RUN_CS_CHECK"
+    value: "true"
+}

.kokoro/secrets-example.sh

@@ -1,14 +1,23 @@
 #!/bin/bash
 
-################################################################################
-# Run the following gcloud command to decrypt secrets.sh.enc as follows:       #
-#                                                                              #
-# gcloud kms decrypt --location=global --keyring=ci --key=ci \                 #
-#   --ciphertext-file=.kokoro/secrets.sh.enc \                                 #
-#   --plaintext-file=.kokoro/secrets.sh                                        #
-#                                                                              #
-# Then run `source .kokoro/secrets.sh`                                         #
-################################################################################
+# This file contains the necessary environment variables for the kokoro
+# tests. Contact the repository owners if you need access to view or modify
+# the variables.
+#
+# Run the following gcloud command to decrypt secrets.sh.enc as follows:
+#
+# gcloud kms decrypt --location=global --keyring=ci --key=ci \
+#   --ciphertext-file=.kokoro/secrets.sh.enc \
+#   --plaintext-file=.kokoro/secrets.sh
+#
+# Then run `source .kokoro/secrets.sh`
+#
+# To modify the file, edit .kokoro/secrets.sh then use the following gcloud
+# command to encrypt it with the changes:
+#
+# gcloud kms encrypt --location=global --keyring=ci --key=ci \
+#   --ciphertext-file=.kokoro/secrets.sh.enc \
+#   --plaintext-file=.kokoro/secrets.sh
 
 # General
 export GOOGLE_PROJECT_ID=
@@ -57,8 +66,6 @@ export CLOUD_DATASTORE_NAMESPACE=
 export DATASTORE_EVENTUALLY_CONSISTENT_RETRY_COUNT=
 
 # DLP
-export DLP_TOPIC=dlp-tests
-export DLP_SUBSCRIPTION=dlp-tests
 export DLP_DEID_WRAPPED_KEY=
 export DLP_DEID_KEY_NAME=projects/$GOOGLE_PROJECT_ID/locations/global/keyRings/ci/cryptoKeys/ci
 
@@ -91,6 +98,10 @@ export REDIS_PORT=
 export GOOGLE_PUBSUB_SUBSCRIPTION=php-example-subscription
 export GOOGLE_PUBSUB_TOPIC=php-example-topic
 
+# Security Center
+export GOOGLE_ORGANIZATION_ID=
+export GOOGLE_SECURITYCENTER_PUBSUB_TOPIC=
+
 # Spanner
 export GOOGLE_SPANNER_INSTANCE_ID=
 export GOOGLE_SPANNER_DATABASE_ID=test-database

.kokoro/secrets.sh.enc

@@ -52,8 +52,6 @@ export PULL_REQUEST_NUMBER=$KOKORO_GITHUB_PULL_REQUEST_NUMBER
 
 # Run code standards check when appropriate
 if [ "${RUN_CS_CHECK}" = "true" ]; then
-  curl -L https://cs.sensiolabs.org/download/php-cs-fixer-v2.phar -o php-cs-fixer \
-       && chmod a+x php-cs-fixer
   bash testing/run_cs_check.sh
 fi
 
@@ -64,7 +62,7 @@ if [ "${RUN_REST_TESTS_ONLY}" = "true" ]; then
 fi
 
 # Install global test dependencies
-bash testing/composer.sh
+composer install -d testing/
 
 # Run tests
 bash testing/run_test_suite.sh

.kokoro/system_tests.sh

@@ -10,6 +10,9 @@ return PhpCsFixer\Config::create()
         'method_argument_space' => [
             'keep_multiple_spaces_after_comma' => true
         ],
+        'return_type_declaration' => [
+            'space_before' => 'none'
+        ],
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()

.php_cs.dist

@@ -0,0 +1,16 @@
+# Code owners file.
+# This file controls who is tagged for review for any given pull request.
+#
+# For syntax help see:
+# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
+
+
+# The php-admins team is the default owner for anything not
+# explicitly taken by someone else.
+*                         @GoogleCloudPlatform/php-admins
+
+/bigtable/                @GoogleCloudPlatform/bigtable-dpe @GoogleCloudPlatform/php-admins
+/cloud_sql/               @GoogleCloudPlatform/cloud-sql-dpes @GoogleCloudPlatform/php-admins
+/datastore/               @GoogleCloudPlatform/firestore-dpe @GoogleCloudPlatform/php-admins
+/firestore/               @GoogleCloudPlatform/firestore-dpe @GoogleCloudPlatform/php-admins
+/storage/                 @GoogleCloudPlatform/storage-dpe @GoogleCloudPlatform/php-admins

CODEOWNERS

@@ -21,49 +21,86 @@ accept your pull requests.
 
 ## Contributing A Patch
 
-1. Submit an issue describing your proposed change to the repo in question.
+1. Submit an issue describing your proposed change.
 1. The repo owner will respond to your issue promptly.
 1. If your proposed change is accepted, and you haven't already done so, sign a
    Contributor License Agreement (see details above).
-1. Fork the desired repo, develop and test your code changes.
-
-   Install dependencies via [Composer](http://getcomposer.org/doc/00-intro.md).
-   Run `composer install` (if composer is installed globally).
-
-   To run the tests, first set up [application default
-   credentials](https://cloud.google.com/docs/authentication/getting-started)
-   by setting the environment variable `GOOGLE_APPLICATION_CREDENTIALS` to the
-   path to a service account key JSON file.
-
-   Then set any environment variables needed by the test. Check the
-   `$SAMPLES_DIRECTORY/test` directory to see what specific variables are needed.
-   ```
-   export GOOGLE_PROJECT_ID=YOUR_PROJECT_ID
-   export GOOGLE_STORAGE_BUCKET=YOUR_BUCKET
-   ```
-
-   To run the tests in a samples directory, first install the global Composer
-   dependencies by running `bash test/composer.sh`. Then, run `composer install`
-   and `phpunit` in any directory containing a `phpunit.xml.dist` file to run
-   the tests.
-   ```
-   bash test/composer.sh
-   cd $SAMPLES_DIRECTORY
-   composer install
-   phpunit
-   ```
-
+1. Fork this repo, develop and test your code changes.
 1. Ensure that your code adheres to the existing style in the sample to which
    you are contributing.
 1. Ensure that your code has an appropriate set of unit tests which all pass.
-   Set up [Travis](./TRAVIS.md) to run the unit tests on your fork.
 1. Submit a pull request.
 
+## Testing your code changes.
+
+### Install dependencies
+
+To run the tests in a samples directory, you will need to install
+[Composer](http://getcomposer.org/doc/00-intro.md).
+
+First install the testing dependencies which are shared across all samples:
+
+```
+composer install -d testing/
+```
+
+Next, install the dependencies for the individual sample you're testing:
+
+```
+SAMPLES_DIRECTORY=translate
+cd $SAMPLES_DIRECTORY
+composer install
+```
+
+### Environment variables
+Set up [application default credentials](https://cloud.google.com/docs/authentication/getting-started)
+by setting the environment variable `GOOGLE_APPLICATION_CREDENTIALS` to the path to a service
+account key JSON file.
+
+Then set any environment variables needed by the test. Check the
+`$SAMPLES_DIRECTORY/test` directory to see what specific variables are needed.
+```
+export GOOGLE_PROJECT_ID=YOUR_PROJECT_ID
+export GOOGLE_STORAGE_BUCKET=YOUR_BUCKET
+```
+
+If your tests require new environment variables, you can set them up in
+[.kokoro/secrets.sh.enc](.kokoro/secrets.sh.enc). For instructions on managing those variables,
+view [.kokoro/secrets-example.sh](.kokoro/secrets-example.sh) for more information.
+
+### Run the tests
+
+Once the dependencies are installed and the environment variables set, you can run the
+tests in a samples directory.
+```
+cd $SAMPLES_DIRECTORY
+# Execute the "phpunit" installed for the shared dependencies
+PATH_TO_REPO=/path/to/php-docs-samples
+$PATH_TO_REPO/testing/vendor/bin/phpunit
+```
+
+Use `phpunit -v` to get a more detailed output if there are errors.
+
 ## Style
 
 Samples in this repository follow the [PSR2][psr2] and [PSR4][psr4]
 recommendations. This is enforced using [PHP CS Fixer][php-cs-fixer].
 
+Install that by running
+
+```
+composer global require friendsofphp/php-cs-fixer
+```
+
+Then to fix your directory or file run 
+
+```
+php-cs-fixer fix .
+php-cs-fixer fix path/to/file
+```
+
+The [DLP snippets](https://github.com/GoogleCloudPlatform/php-docs-samples/tree/master/dlp) are an example of snippets following the latest style guidelines.
+
 [psr2]: http://www.php-fig.org/psr/psr-2/
 [psr4]: http://www.php-fig.org/psr/psr-4/
 [php-cs-fixer]: https://github.com/FriendsOfPHP/PHP-CS-Fixer