#2913690: PHPCS and refactor cleanup

.travis.yml

@@ -3,7 +3,6 @@ language: php
 sudo: false
 
 php:
-  - 5.6
   - 7.0
   - 7.1
 
@@ -57,4 +56,4 @@ install:
 
 script:
   - ./run-tests.sh
-  - composer phpcs
+  - composer phpcs

config/install/cloudflare.settings.yml

@@ -0,0 +1,6 @@
+client_ip_restore_enabled: false
+bypass_host: ''
+valid_credentials: false
+zone_id: ''
+apikey: ''
+email: ''

config/schema/cloudflare.settings.schema.yml

@@ -1,4 +1,4 @@
- # Schema for the configuration files of the CloudFlare module.
+# Schema for the configuration files of the CloudFlare module.
 cloudflare.settings:
   type: config_object
   label: 'CloudFlare Config'

modules/cloudflare_form_tester/src/Mocks/ZoneMock.php

@@ -71,10 +71,10 @@ class ZoneMock implements CloudFlareZoneInterface {
   /**
    * {@inheritdoc}
    */
-  public static function create(ConfigFactoryInterface $config, LoggerInterface $logger, CloudFlareStateInterface $state, CloudFlareComposerDependenciesCheckInterface $check_interface) {
+  public static function create(ConfigFactoryInterface $config_factory, LoggerInterface $logger, CloudFlareStateInterface $state, CloudFlareComposerDependenciesCheckInterface $check_interface) {
 
     return new static(
-      $config,
+      $config_factory,
       $logger,
       $state,
       $check_interface
@@ -84,17 +84,17 @@ public static function create(ConfigFactoryInterface $config, LoggerInterface $l
   /**
    * Zone constructor.
    *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
-   *   CloudFlare config object.
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory.
    * @param \Psr\Log\LoggerInterface $logger
    *   A logger instance.
    * @param \Drupal\cloudflare\CloudFlareStateInterface $state
    *   Tracks rate limits associated with CloudFlare Api.
    * @param \Drupal\cloudflare\CloudFlareComposerDependenciesCheckInterface $check_interface
    *   Checks that composer dependencies are met.
    */
-  public function __construct(ConfigFactoryInterface $config, LoggerInterface $logger, CloudFlareStateInterface $state, CloudFlareComposerDependenciesCheckInterface $check_interface) {
-    $this->config = $config->get('cloudflare.settings');
+  public function __construct(ConfigFactoryInterface $config_factory, LoggerInterface $logger, CloudFlareStateInterface $state, CloudFlareComposerDependenciesCheckInterface $check_interface) {
+    $this->config = $config_factory->get('cloudflare.settings');
     $this->logger = $logger;
     $this->state = $state;
     $this->zone = $this->config->get('zone');

modules/cloudflarepurger/src/Plugin/Purge/DiagnosticCheck/CredentialCheck.php

@@ -35,12 +35,12 @@ class CredentialCheck extends DiagnosticCheckBase implements DiagnosticCheckInte
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The factory for configuration objects.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->config = $config->get('cloudflare.settings');
+    $this->config = $config_factory->get('cloudflare.settings');
   }
 
   /**

modules/cloudflarepurger/src/Plugin/Purge/Purger/CloudFlarePurger.php

@@ -93,7 +93,7 @@ public static function create(ContainerInterface $container, array $configuratio
    *   The plugin_id for the plugin instance.
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The factory for configuration objects.
    * @param \Drupal\cloudflare\CloudFlareStateInterface $state
    *   Tracks limits associated with CloudFlare Api.
@@ -105,10 +105,10 @@ public static function create(ContainerInterface $container, array $configuratio
    * @throws \LogicException
    *   Thrown if $configuration['id'] is missing, see Purger\Service::createId.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config, CloudFlareStateInterface $state, LoggerInterface $logger, CloudFlareComposerDependenciesCheckInterface $checker) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, ConfigFactoryInterface $config_factory, CloudFlareStateInterface $state, LoggerInterface $logger, CloudFlareComposerDependenciesCheckInterface $checker) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
-    $this->config = $config->get('cloudflare.settings');
+    $this->config = $config_factory->get('cloudflare.settings');
     $this->state = $state;
     $this->logger = $logger;
     $this->areCloudflareComposerDepenciesMet = $checker->check();

modules/cloudflarepurger/src/Tests/DiagnosticCheck/ApiRateLimitCheckTest.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\cloudflarepurger\Tests\DiagnosticCheck;
 
-use DateTime;
 use Drupal\purge\Plugin\Purge\DiagnosticCheck\DiagnosticCheckInterface;
 use Drupal\cloudflare\State;
 use Drupal\cloudflarepurger\Plugin\Purge\DiagnosticCheck\ApiRateLimitCheck;
@@ -29,7 +28,7 @@ class ApiRateLimitCheckTest extends DiagnosticCheckTestBase {
    */
   public function testApiRateLimitCheck($api_rate, $expected_severity) {
     $this->drupalState->set(State::API_RATE_COUNT, $api_rate);
-    $this->drupalState->set(State::API_RATE_COUNT_START, new DateTime());
+    $this->drupalState->set(State::API_RATE_COUNT_START, new \DateTime());
 
     $api_rate_limit_check = new ApiRateLimitCheck([], '23123', 'this is a definition', $this->cloudflareState, $this->composerDependencyStub);
     $actual_severity = $api_rate_limit_check->run();

modules/cloudflarepurger/src/Tests/DiagnosticCheck/DailyTagPurgeLimitCheckTest.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\cloudflarepurger\Tests\DiagnosticCheck;
 
-use DateTime;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\purge\Plugin\Purge\DiagnosticCheck\DiagnosticCheckInterface;
 use Drupal\cloudflare\State;
@@ -39,7 +38,7 @@ public function setUp() {
    */
   public function testDailyTagPurgeLimitCheck($api_rate, $expected_severity) {
     $this->drupalState->set(State::TAG_PURGE_DAILY_COUNT, $api_rate);
-    $this->drupalState->set(State::TAG_PURGE_DAILY_COUNT_START, new DateTime());
+    $this->drupalState->set(State::TAG_PURGE_DAILY_COUNT_START, new \DateTime());
 
     $api_rate_limit_check = new DailyTagPurgeLimitCheck([], '23123', 'this is a definition', $this->cloudflareState, $this->composerDependencyStub);
     $actual_severity = $api_rate_limit_check->run();

src/EventSubscriber/ClientIpRestore.php

@@ -67,7 +67,7 @@ class ClientIpRestore implements EventSubscriberInterface {
   /**
    * Constructs a ClientIpRestore.
    *
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The factory for configuration objects.
    * @param \Drupal\Core\Cache\CacheBackendInterface $cache
    *   Cache backend.
@@ -76,10 +76,10 @@ class ClientIpRestore implements EventSubscriberInterface {
    * @param \Psr\Log\LoggerInterface $logger
    *   A logger instance.
    */
-  public function __construct(ConfigFactoryInterface $config, CacheBackendInterface $cache, ClientInterface $http_client, LoggerInterface $logger) {
+  public function __construct(ConfigFactoryInterface $config_factory, CacheBackendInterface $cache, ClientInterface $http_client, LoggerInterface $logger) {
     $this->httpClient = $http_client;
     $this->cache = $cache;
-    $this->config = $config->get('cloudflare.settings');
+    $this->config = $config_factory->get('cloudflare.settings');
     $this->logger = $logger;
     $this->isClientIpRestoreEnabled = $this->config->get(SELF::CLOUDFLARE_CLIENT_IP_RESTORE_ENABLED);
     $this->bypassHost = $this->config->get(SELF::CLOUDFLARE_BYPASS_HOST);