Add cs-check to build process (#83)

Author: keelerm84

.circleci/config.yml

@@ -72,6 +72,9 @@ jobs:
       - run:
           name: psalm linting
           command: ./vendor/bin/psalm --no-cache
+      - run:
+          name: php-cs-fixer check
+          command: composer cs-check
       - run: mkdir -p ~/phpunit
       - run:
           name: run tests with highest compatible dependency versions

.php-cs-fixer.php

@@ -0,0 +1,15 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()->in(__DIR__);
+
+$config = new PhpCsFixer\Config();
+return $config
+    ->setFinder($finder)
+    ->setUsingCache(true)
+    ->setRules([
+        '@PSR2' => true,
+        'blank_line_after_opening_tag' => true,
+        'ordered_imports' => true,
+        'no_unused_imports' => true,
+        'array_syntax' => ['syntax' => 'short'],
+    ]);

.php_cs

@@ -44,6 +44,7 @@
         "sort-packages": true
     },
     "scripts": {
-        "cs": "vendor/bin/php-cs-fixer fix --diff --verbose"
+        "cs-check": "vendor/bin/php-cs-fixer fix --diff --dry-run --verbose",
+        "cs-fix": "vendor/bin/php-cs-fixer fix --diff --verbose"
     }
 }

composer.json

@@ -2,8 +2,6 @@
 
 namespace LaunchDarkly;
 
-use \LaunchDarkly\EvaluationReason;
-
 /**
  * An object that combines the result of a flag evaluation with an explanation of how it was calculated.
  *

src/LaunchDarkly/EvaluationDetail.php

@@ -166,8 +166,8 @@ private function __construct(
         ?int $ruleIndex = null,
         ?string $ruleId = null,
         ?string $prerequisiteKey = null,
-        bool $inExperiment = false)
-    {
+        bool $inExperiment = false
+    ) {
         $this->_kind = $kind;
         $this->_errorKind = $errorKind;
         $this->_ruleIndex = $ruleIndex;
@@ -258,7 +258,7 @@ public function __toString(): string
      */
     public function jsonSerialize(): array
     {
-        $ret = array('kind' => $this->_kind);
+        $ret = ['kind' => $this->_kind];
         if ($this->_errorKind !== null) {
             $ret['errorKind'] = $this->_errorKind;
         }

src/LaunchDarkly/EvaluationReason.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace LaunchDarkly;
 
 /**

src/LaunchDarkly/EventPublisher.php

@@ -1,8 +1,8 @@
 <?php
+
 namespace LaunchDarkly;
 
 use LaunchDarkly\Impl\Model\FeatureFlag;
-use LaunchDarkly\LDClient;
 
 /**
  * A snapshot of the state of all feature flags with regard to a specific user.
@@ -30,25 +30,25 @@ class FeatureFlagsState implements \JsonSerializable
     public function __construct(bool $valid)
     {
         $this->_valid = $valid;
-        $this->_flagValues = array();
-        $this->_flagMetadata = array();
+        $this->_flagValues = [];
+        $this->_flagMetadata = [];
     }
 
     /**
      * Used internally to build the state map.
      *
      * @ignore
-     * 
+     *
      * @return void
      */
     public function addFlag(
         FeatureFlag $flag,
         EvaluationDetail $detail,
         bool $withReason = false,
-        bool $detailsOnlyIfTracked = false): void
-    {
+        bool $detailsOnlyIfTracked = false
+    ): void {
         $this->_flagValues[$flag->getKey()] = $detail->getValue();
-        $meta = array();
+        $meta = [];
         if (!$detailsOnlyIfTracked || $flag->isTrackEvents() || $flag->getDebugEventsUntilDate()) {
             $meta['version'] = $flag->getVersion();
             if ($withReason) {
@@ -106,9 +106,9 @@ public function getFlagReason(string $key): ?EvaluationReason
 
     /**
      * Returns an associative array of flag keys to flag values.
-     * 
+     *
      * If a flag would have evaluated to the default value, its value will be null.
-     * 
+     *
      * Do not use this method if you are passing data to the front end to "bootstrap" the JavaScript client.
      * Instead, use jsonSerialize().
      * @return array an associative array of flag keys to JSON values
@@ -121,17 +121,17 @@ public function toValuesMap(): array
     /**
      * Returns a JSON representation of the entire state map (as an associative array), in the format used
      * by the LaunchDarkly JavaScript SDK.
-     * 
+     *
      * Use this method if you are passing data to the front end in order to "bootstrap" the JavaScript client.
-     * 
+     *
      * Note that calling json_encode() on a FeatureFlagsState object will automatically use the
      * jsonSerialize() method.
      * @return array an associative array suitable for passing as a JSON object
      */
     public function jsonSerialize(): array
     {
         $ret = array_replace([], $this->_flagValues);
-        $metaMap = array();
+        $metaMap = [];
         foreach ($this->_flagMetadata as $key => $meta) {
             $meta = array_replace([], $meta);
             if (isset($meta['reason'])) {

src/LaunchDarkly/FeatureFlagsState.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace LaunchDarkly;
 
 use LaunchDarkly\Impl\Model\FeatureFlag;

src/LaunchDarkly/FeatureRequester.php

@@ -1,11 +1,12 @@
 <?php
+
 namespace LaunchDarkly\Impl\Events;
 
 use LaunchDarkly\EvaluationDetail;
 use LaunchDarkly\EvaluationReason;
-use LaunchDarkly\LDUser;
-use LaunchDarkly\Impl\Util;
 use LaunchDarkly\Impl\Model\FeatureFlag;
+use LaunchDarkly\Impl\Util;
+use LaunchDarkly\LDUser;
 
 /**
  * @ignore
@@ -34,10 +35,10 @@ public function newEvalEvent(
         LDUser $user,
         EvaluationDetail $detail,
         $default,
-        $prereqOfFlag = null): array
-    {
+        $prereqOfFlag = null
+    ): array {
         $addExperimentData = static::isExperiment($flag, $detail->getReason());
-        $e = array(
+        $e = [
             'kind' => 'feature',
             'creationDate' => Util::currentTimeUnixMillis(),
             'key' => $flag->getKey(),
@@ -46,7 +47,7 @@ public function newEvalEvent(
             'value' => $detail->getValue(),
             'default' => $default,
             'version' => $flag->getVersion()
-        );
+        ];
         // the following properties are handled separately so we don't waste bandwidth on unused keys
         if ($addExperimentData || $flag->isTrackEvents()) {
             $e['trackEvents'] = true;
@@ -71,15 +72,15 @@ public function newEvalEvent(
      */
     public function newDefaultEvent(FeatureFlag $flag, LDUser $user, EvaluationDetail $detail): array
     {
-        $e = array(
+        $e = [
             'kind' => 'feature',
             'creationDate' => Util::currentTimeUnixMillis(),
             'key' => $flag->getKey(),
             'user' => $user,
             'value' => $detail->getValue(),
             'default' => $detail->getValue(),
             'version' => $flag->getVersion()
-        );
+        ];
         // the following properties are handled separately so we don't waste bandwidth on unused keys
         if ($flag->isTrackEvents()) {
             $e['trackEvents'] = true;
@@ -101,14 +102,14 @@ public function newDefaultEvent(FeatureFlag $flag, LDUser $user, EvaluationDetai
      */
     public function newUnknownFlagEvent(string $key, LDUser $user, EvaluationDetail $detail): array
     {
-        $e = array(
+        $e = [
             'kind' => 'feature',
             'creationDate' => Util::currentTimeUnixMillis(),
             'key' => $key,
             'user' => $user,
             'value' => $detail->getValue(),
             'default' => $detail->getValue()
-        );
+        ];
         // the following properties are handled separately so we don't waste bandwidth on unused keys
         if ($this->_withReasons && $detail->getReason()) {
             $e['reason'] = $detail->getReason()->jsonSerialize();
@@ -124,12 +125,12 @@ public function newUnknownFlagEvent(string $key, LDUser $user, EvaluationDetail
      */
     public function newIdentifyEvent(LDUser $user): array
     {
-        return array(
+        return [
             'kind' => 'identify',
             'creationDate' => Util::currentTimeUnixMillis(),
             'key' => strval($user->getKey()),
             'user' => $user
-        );
+        ];
     }
 
     /**
@@ -142,12 +143,12 @@ public function newIdentifyEvent(LDUser $user): array
      */
     public function newCustomEvent(string $eventName, LDUser $user, $data, $metricValue): array
     {
-        $e = array(
+        $e = [
             'kind' => 'custom',
             'creationDate' => Util::currentTimeUnixMillis(),
             'key' => $eventName,
             'user' => $user
-        );
+        ];
         if (isset($data)) {
             $e['data'] = $data;
         }
@@ -165,14 +166,14 @@ public function newCustomEvent(string $eventName, LDUser $user, $data, $metricVa
      */
     public function newAliasEvent(LDUser $user, LDUser $previousUser): array
     {
-        $e = array(
+        $e = [
             'kind' => 'alias',
             'key' => strval($user->getKey()),
             'contextKind' => static::contextKind($user),
             'previousKey' => strval($previousUser->getKey()),
             'previousContextKind' => static::contextKind($previousUser),
             'creationDate' => Util::currentTimeUnixMillis()
-        );
+        ];
 
         return $e;
     }