Reorganize to top-level src/ layout; remove unused installer config

composer.json

@@ -1,5 +1,6 @@
 {
     "name": "digitalpolygon/polymer-pantheon-drupal",
+    "type": "polymer-plugin",
     "description": "Helpful scripts and tools for integrating Drupal with Pantheon.",
     "authors":[
         {
@@ -14,11 +15,6 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "autoload": {
-        "psr-4": {
-            "DigitalPolygon\\PolymerPantheon\\Drupal\\": "./src/"
-        }
-    },
     "require": {
         "digitalpolygon/polymer-drupal": "0.x-dev",
         "pantheon-systems/drupal-integrations": "* !=11.0.0"
@@ -35,17 +31,23 @@
             "digitalpolygon/polymer": true,
             "digitalpolygon/drupal-upgrade-plugin": true,
             "phpstan/extension-installer": true,
-            "phpro/grumphp-shim": true
+            "phpro/grumphp-shim": true,
+            "composer/installers": true
         }
     },
     "scripts": {
         "lint": "find src test/src -name '*.php' -print0 | xargs -0 -n1 -P4 -- php -l",
-        "cs": "phpcs",
+        "cs": "phpcs --standard=phpcs-non-drupal.xml.dist --report=full -s",
         "sa": "phpstan analyse -v -c phpstan.neon",
         "validations": [
             "@lint",
             "@cs",
             "@sa"
         ]
+    },
+  "autoload-dev": {
+    "psr-4": {
+      "DigitalPolygon\\Polymer\\polymer_drupal\\": "vendor/digitalpolygon/polymer-drupal/src/"
     }
+  }
 }

grumphp.yml

@@ -1,2 +1,19 @@
 grumphp:
-    tasks: {  }
+  hooks_dir: grumphp/hooks
+  tasks:
+    phpcs:
+      standard: PSR12
+      warning_severity: 0
+      whitelist_patterns:
+        - src
+#    phpcs_drupal:
+#      standard:
+#        - Drupal
+#        - DrupalPractice
+#      warning_severity: 0
+#      whitelist_patterns:
+#        - settings
+#      metadata:
+#        task: phpcs
+    phpstan: null
+    phplint: null

grumphp/hooks/commit-msg

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+#
+# Run the hook command.
+# Note: this will be replaced by the real command during copy.
+#
+
+GIT_USER=$(git config user.name)
+GIT_EMAIL=$(git config user.email)
+COMMIT_MSG_FILE=$1
+
+# Fetch the GIT diff and format it as command input:
+DIFF=$(git -c diff.mnemonicprefix=false -c diff.noprefix=false --no-pager diff -r -p -m -M --full-index --no-color --staged | cat)
+
+# Grumphp env vars
+$(ENV)
+export GRUMPHP_GIT_WORKING_DIR="$(git rev-parse --show-toplevel)"
+
+DDEV_PREFIX="ddev exec --"
+COMMAND_PREFIX=""
+
+if [ -z "${IS_DDEV_PROJECT}" ] && [ -d .ddev ] && command -v ddev >/dev/null 2>&1; then
+  COMMAND_PREFIX="${DDEV_PREFIX}"
+fi
+
+# Run GrumPHP
+(cd "${HOOK_EXEC_PATH}" && printf "%s\n" "${DIFF}" | $COMMAND_PREFIX $(EXEC_GRUMPHP_COMMAND) $(HOOK_COMMAND) "--git-user='$GIT_USER'" "--git-email='$GIT_EMAIL'" "$COMMIT_MSG_FILE")

grumphp/hooks/pre-commit

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+#
+# Run the hook command.
+# Note: this will be replaced by the real command during copy.
+#
+
+# Fetch the GIT diff and format it as command input:
+DIFF=$(git -c diff.mnemonicprefix=false -c diff.noprefix=false --no-pager diff -r -p -m -M --full-index --no-color --staged | cat)
+
+# Grumphp env vars
+$(ENV)
+export GRUMPHP_GIT_WORKING_DIR="$(git rev-parse --show-toplevel)"
+
+DDEV_PREFIX="ddev exec --"
+COMMAND_PREFIX=""
+
+if [ -z "${IS_DDEV_PROJECT}" ] && [ -d .ddev ] && command -v ddev >/dev/null 2>&1; then
+  COMMAND_PREFIX="${DDEV_PREFIX}"
+fi
+
+# Run GrumPHP
+(cd "${HOOK_EXEC_PATH}" && printf "%s\n" "${DIFF}" | $COMMAND_PREFIX $(EXEC_GRUMPHP_COMMAND) $(HOOK_COMMAND) '--skip-success-output')

phpcs-drupal.xml.dist

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="polymer-drupal-settings">
+    <description>Default PHP CodeSniffer configuration for the Drupal Integration for Polymer WebOps Tooling project.</description>
+    <file>settings</file>
+    <rule ref="Drupal" />
+    <rule ref="DrupalPractice" />
+    <arg value="n" />
+    <arg value="s" />
+</ruleset>

phpcs-non-drupal.xml.dist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="polymer-drupal-src">
+    <description>Default PHP CodeSniffer configuration for the Drupal Integration for Polymer WebOps Tooling project.</description>
+    <file>src</file>
+    <rule ref="PSR12" />
+    <arg value="n" />
+    <arg value="s" />
+</ruleset>

polymer_pantheon_drupal.poly_info.yml

@@ -0,0 +1 @@
+name: Polymer Pantheon Drupal

src/Polymer/Exception/TerminusPluginNotInstalledException.php → src/Exception/TerminusPluginNotInstalledException.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer\Exception;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal\Exception;
 
 class TerminusPluginNotInstalledException extends \RuntimeException
 {

src/Polymer/ExtensionInfo.php → src/ExtensionInfo.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal;
 
-use DigitalPolygon\Polymer\Robo\Extension\PolymerExtensionBase;
+use DigitalPolygon\Polymer\Core\Robo\Extension\PolymerExtensionBase;
 
 class ExtensionInfo extends PolymerExtensionBase
 {

src/Polymer/Plugin/Commands/NewRelicCommands.php → src/Plugin/Commands/NewRelicCommands.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Commands;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal\Plugin\Commands;
 
 use Consolidation\AnnotatedCommand\Attributes\Command;
 use Consolidation\AnnotatedCommand\Attributes\HookSelector;
-use DigitalPolygon\Polymer\Robo\Tasks\TaskBase;
+use DigitalPolygon\Polymer\Core\Robo\Tasks\TaskBase;
 use Robo\Exception\AbortTasksException;
 use Robo\Symfony\ConsoleIO;
 

src/Polymer/Plugin/Commands/PantheonFileCommands.php → src/Plugin/Commands/PantheonFileCommands.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Commands;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal\Plugin\Commands;
 
 use Consolidation\AnnotatedCommand\Attributes\Command;
 use Consolidation\AnnotatedCommand\Attributes\Hook;
 use Consolidation\AnnotatedCommand\Attributes\HookSelector;
 use Consolidation\AnnotatedCommand\Attributes\Option;
 use Consolidation\AnnotatedCommand\CommandData;
 use Consolidation\AnnotatedCommand\Hooks\HookManager;
-use DigitalPolygon\Polymer\Robo\Commands\Template\TemplateCommand;
-use DigitalPolygon\Polymer\Robo\Tasks\TaskBase;
-use DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\DrushSiteYaml;
-use DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\PantheonYaml;
-use DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\QuicksilverYaml;
+use DigitalPolygon\Polymer\Core\Robo\Commands\Template\TemplateCommand;
+use DigitalPolygon\Polymer\Core\Robo\Tasks\TaskBase;
+use DigitalPolygon\Polymer\polymer_pantheon_drupal\Plugin\Template\DrushSiteYaml;
+use DigitalPolygon\Polymer\polymer_pantheon_drupal\Plugin\Template\PantheonYaml;
+use DigitalPolygon\Polymer\polymer_pantheon_drupal\Plugin\Template\QuicksilverYaml;
 use Robo\Contract\VerbosityThresholdInterface;
 use Robo\Symfony\ConsoleIO;
 

src/Polymer/Plugin/Hooks/PantheonArtifactHook.php → src/Plugin/Hooks/PantheonArtifactHook.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Hooks;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal\Plugin\Hooks;
 
 use Consolidation\AnnotatedCommand\AnnotatedCommand;
 use Consolidation\AnnotatedCommand\AnnotationData;
 use Consolidation\AnnotatedCommand\Attributes\Hook;
 use Consolidation\AnnotatedCommand\CommandData;
 use Consolidation\AnnotatedCommand\Hooks\HookManager;
-use DigitalPolygon\Polymer\Robo\Commands\Artifact\DeployCommand;
-use DigitalPolygon\Polymer\Robo\Exceptions\BadConfigurationValueException;
-use DigitalPolygon\Polymer\Robo\Tasks\TaskBase;
+use DigitalPolygon\Polymer\Core\Robo\Commands\Artifact\DeployCommand;
+use DigitalPolygon\Polymer\Core\Robo\Exceptions\BadConfigurationValueException;
+use DigitalPolygon\Polymer\Core\Robo\Tasks\TaskBase;
 
 class PantheonArtifactHook extends TaskBase
 {

src/Polymer/Plugin/Template/DrushSiteYaml.php → src/Plugin/Template/DrushSiteYaml.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal\Plugin\Template;
 
-use DigitalPolygon\Polymer\Robo\Template\Template;
-use DigitalPolygon\Polymer\Robo\Template\Token;
+use DigitalPolygon\Polymer\Core\Robo\Template\Template;
+use DigitalPolygon\Polymer\Core\Robo\Template\Token;
 
 class DrushSiteYaml extends Template
 {

src/Polymer/Plugin/Template/GitHubWorkflows/PantheonPrMultidevCreate.php → src/Plugin/Template/GitHubWorkflows/PantheonPrMultidevCreate.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\GitHubWorkflows;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal\Plugin\Template\GitHubWorkflows;
 
-use DigitalPolygon\Polymer\Robo\Template\GitHub\GitHubWorkflowTemplateBase;
-use DigitalPolygon\Polymer\Robo\Template\Token;
+use DigitalPolygon\Polymer\Core\Robo\Template\GitHub\GitHubWorkflowTemplateBase;
+use DigitalPolygon\Polymer\Core\Robo\Template\Token;
 
 final class PantheonPrMultidevCreate extends GitHubWorkflowTemplateBase
 {

src/Polymer/Plugin/Template/GitHubWorkflows/PantheonPrMultidevDelete.php → src/Plugin/Template/GitHubWorkflows/PantheonPrMultidevDelete.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\GitHubWorkflows;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal\Plugin\Template\GitHubWorkflows;
 
-use DigitalPolygon\Polymer\Robo\Template\GitHub\GitHubWorkflowTemplateBase;
-use DigitalPolygon\Polymer\Robo\Template\Token;
+use DigitalPolygon\Polymer\Core\Robo\Template\GitHub\GitHubWorkflowTemplateBase;
+use DigitalPolygon\Polymer\Core\Robo\Template\Token;
 
 final class PantheonPrMultidevDelete extends GitHubWorkflowTemplateBase
 {

src/Polymer/Plugin/Template/GitHubWorkflows/PantheonPush.php → src/Plugin/Template/GitHubWorkflows/PantheonPush.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\GitHubWorkflows;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal\Plugin\Template\GitHubWorkflows;
 
-use DigitalPolygon\Polymer\Robo\Template\GitHub\GitHubWorkflowTemplateBase;
-use DigitalPolygon\Polymer\Robo\Template\Token;
+use DigitalPolygon\Polymer\Core\Robo\Template\GitHub\GitHubWorkflowTemplateBase;
+use DigitalPolygon\Polymer\Core\Robo\Template\Token;
 
 final class PantheonPush extends GitHubWorkflowTemplateBase
 {

src/Polymer/Plugin/Template/GitHubWorkflows/PantheonPushDev.php → src/Plugin/Template/GitHubWorkflows/PantheonPushDev.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\GitHubWorkflows;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal\Plugin\Template\GitHubWorkflows;
 
-use DigitalPolygon\Polymer\Robo\Template\GitHub\GitHubWorkflowTemplateBase;
-use DigitalPolygon\Polymer\Robo\Template\Token;
+use DigitalPolygon\Polymer\Core\Robo\Template\GitHub\GitHubWorkflowTemplateBase;
+use DigitalPolygon\Polymer\Core\Robo\Template\Token;
 
 final class PantheonPushDev extends GitHubWorkflowTemplateBase
 {

src/Polymer/Plugin/Template/PantheonYaml.php → src/Plugin/Template/PantheonYaml.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal\Plugin\Template;
 
-use DigitalPolygon\Polymer\Robo\Template\Template;
-use DigitalPolygon\Polymer\Robo\Template\Token;
+use DigitalPolygon\Polymer\Core\Robo\Template\Template;
+use DigitalPolygon\Polymer\Core\Robo\Template\Token;
 
 class PantheonYaml extends Template
 {

src/Polymer/Plugin/Template/QuicksilverYaml.php → src/Plugin/Template/QuicksilverYaml.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal\Plugin\Template;
 
-use DigitalPolygon\Polymer\Robo\Template\Template;
+use DigitalPolygon\Polymer\Core\Robo\Template\Template;
 
 class QuicksilverYaml extends Template
 {

src/Polymer/PolymerPantheonDrupalServiceProvider.php → src/PolymerPantheonDrupalServiceProvider.php

@@ -1,16 +1,8 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal;
 
-use DigitalPolygon\Polymer\Robo\Template\TemplateInterface;
-use DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\DrushSiteYaml;
-use DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\GitHubWorkflows\PantheonPrMultidevCreate;
-use DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\GitHubWorkflows\PantheonPrMultidevDelete;
-use DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\GitHubWorkflows\PantheonPush;
-use DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\GitHubWorkflows\PantheonPushDev;
-use DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\PantheonYaml;
-use DigitalPolygon\PolymerPantheon\Drupal\Polymer\Plugin\Template\QuicksilverYaml;
-use DigitalPolygon\PolymerPantheon\Drupal\Polymer\Services\EventSubscriber\DrupalEventsSubscriber;
+use DigitalPolygon\Polymer\polymer_pantheon_drupal\Services\EventSubscriber\DrupalEventsSubscriber;
 use League\Container\ServiceProvider\AbstractServiceProvider;
 use League\Container\ServiceProvider\BootableServiceProviderInterface;
 

src/Polymer/Services/EventSubscriber/DrupalEventsSubscriber.php → src/Services/EventSubscriber/DrupalEventsSubscriber.php

@@ -1,10 +1,9 @@
 <?php
 
-namespace DigitalPolygon\PolymerPantheon\Drupal\Polymer\Services\EventSubscriber;
+namespace DigitalPolygon\Polymer\polymer_pantheon_drupal\Services\EventSubscriber;
 
-use Consolidation\Config\ConfigInterface;
-use DigitalPolygon\Polymer\Robo\Config\ConfigAwareTrait;
-use DigitalPolygon\PolymerDrupal\Polymer\Services\Event\SiteSettingsFiles;
+use DigitalPolygon\Polymer\Core\Robo\Config\ConfigAwareTrait;
+use DigitalPolygon\Polymer\polymer_drupal\Services\Event\SiteSettingsFiles;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 use Robo\Contract\ConfigAwareInterface;