Update contributors guide and readme

Author: jradcliff

.php-cs-fixer.dist.php

@@ -0,0 +1,42 @@
+<?php
+
+// php-cs-fixer 3.0 distributed config file
+
+$config = new PhpCsFixer\Config();
+$config
+ ->setRules([
+ '@PSR2' => true,
+ 'concat_space' => ['spacing' => 'one'],
+ 'no_unused_imports' => true,
+ 'whitespace_after_comma_in_array' => true,
+ 'method_argument_space' => [
+ 'keep_multiple_spaces_after_comma' => true,
+ 'on_multiline' => 'ignore'
+ ],
+ '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()
+ ->in(__DIR__)
+ )
+;
+
+return $config;

CONTRIBUTING.md

@@ -42,19 +42,8 @@ Write samples according to the [sample style guide](https://googlecloudplatform.
 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
-```
+First install dependencies as described in the
+[README.md](google-analytics-data/README.md).
 
 ### Environment variables
 Some tests require specific environment variables to run. PHPUnit will skip the tests
@@ -64,27 +53,17 @@ to run against any sample project as follows:
 
 ```
 export GOOGLE_PROJECT_ID=YOUR_PROJECT_ID
-export GOOGLE_STORAGE_BUCKET=YOUR_BUCKET
+export GA_TEST_PROPERTY_ID=YOUR_GA4_PROPERTY_ID
 ```
 
-If you have access to the Google Cloud Kokoro project, decrypt the
-`.kokoro/secrets.sh.enc` file and load those environment variables. Follow
-the instructions in [.kokoro/secrets-example.sh](.kokoro/secrets-example.sh).
-
-If your tests require new environment variables, you can set them up in
-`.kokoro/secrets.sh.enc` so they pass on Kokoro. 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
+cd google-analytics-data
 # Execute the "phpunit" installed for the shared dependencies
-PATH_TO_REPO=/path/to/php-docs-samples
-$PATH_TO_REPO/testing/vendor/bin/phpunit
+./vendor/bin/phpunit
 ```
 
 Use `phpunit -v` to get a more detailed output if there are errors.
@@ -102,18 +81,16 @@ recommendations. This is enforced using [PHP CS Fixer][php-cs-fixer], using the
 Install that by running
 
 ```
-composer global require friendsofphp/php-cs-fixer
+RUN composer require --dev friendsofphp/php-cs-fixer
 ```
 
 Then to fix your directory or file run
 
 ```
-php-cs-fixer fix . --config .php-cs-fixer.dist.php
-php-cs-fixer fix path/to/file --config .php-cs-fixer.dist.php
+./vendor/bin/php-cs-fixer fix --config .php-cs-fixer.dist.php .
+./vendor/bin/php-cs-fixer fix --config .php-cs-fixer.dist.php path/to/file
 ```
 
-The [DLP snippets](https://github.com/GoogleCloudPlatform/php-docs-samples/tree/main/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

README.md

@@ -2,10 +2,8 @@
 
 PHP samples for [Google Analytics APIs][ga].
 
-Check out the `README.md` in one of the following directories to get started:
-
-- Admin API: [README.md](google-analytics-admin/README.md)
-- Data API: [README.md](google-analytics-data/README.md)
+Check out the [`README.md`](google-analytics-data/README.md) in the
+`google-analytics-data` directory to get started.
 
 ## Contributing