Update PHP Codesniffer (#83)

* Update PHP Codesniffer * Update circleci

Author: f-moya

.circleci/config.yml

@@ -0,0 +1,15 @@
+version: 2.1
+
+jobs:
+ build:
+ machine:
+ docker_layer_caching: true
+ working_directory: ~/codeclimate/codeclimate-phpcodesniffer
+ steps:
+ - checkout
+ - run:
+ name: Build
+ command: make image
+notify:
+ webhooks:
+ - url: https://cc-slack-proxy.herokuapp.com/circle

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:edge
+FROM alpine:3.12
 
 RUN adduser -u 9000 -D app
 
@@ -20,15 +20,9 @@ RUN apk add --no-cache \
  php7-tokenizer \
  php7-xml \
  php7-xmlwriter \
- php7-zlib && \
- EXPECTED_SIGNATURE=$(php -r "echo file_get_contents('https://composer.github.io/installer.sig');") && \
- php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
- ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', 'composer-setup.php');") && \
- [ "$EXPECTED_SIGNATURE" = "$ACTUAL_SIGNATURE" ] || (echo "Invalid Composer installer signature"; exit 1) && \
- php composer-setup.php --quiet && \
- mv composer.phar /usr/local/bin/composer && \
- rm -r composer-setup.php ~/.composer
+ php7-zlib
 
+COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 COPY composer.json composer.lock ./
 
 RUN apk add --no-cache git && \

Runner.php renamed to Executor.php

@@ -1,12 +1,13 @@
 <?php
 
-use PHP_CodeSniffer\Files\FileList;
+use Stringy\Stringy as S;
+use PHP_CodeSniffer\Runner;
+use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Reporter;
+use PHP_CodeSniffer\Files\DummyFile;
 use PHP_CodeSniffer\Util\Timing;
-use PHP_CodeSniffer\Config;
-use Stringy\Stringy as S;
 
-class Runner
+class Executor
 {
  const DEFAULT_EXTENSIONS = array("php", "inc", "module");
 
@@ -23,7 +24,7 @@ public function queueDirectory($dir, $prefix = '')
  {
  chdir("/code");
 
- if(isset($this->config['include_paths'])) {
+ if (isset($this->config['include_paths'])) {
  $this->queueWithIncludePaths();
  } else {
  $this->queuePaths($dir, $prefix, $this->config['exclude_paths']);
@@ -32,7 +33,8 @@ public function queueDirectory($dir, $prefix = '')
  $this->server->process_work(false);
  }
 
- public function queueWithIncludePaths() {
+ public function queueWithIncludePaths()
+ {
  foreach ($this->config['include_paths'] as $f) {
  if ($f !== '.' and $f !== '..') {
  if (is_dir($f)) {
@@ -44,7 +46,8 @@ public function queueWithIncludePaths() {
  }
  }
 
- public function queuePaths($dir, $prefix = '', $exclusions = []) {
+ public function queuePaths($dir, $prefix = '', $exclusions = [])
+ {
  $dir = rtrim($dir, '\\/');
 
  foreach (scandir($dir) as $f) {
@@ -62,7 +65,8 @@ public function queuePaths($dir, $prefix = '', $exclusions = []) {
  }
  }
 
- public function filterByExtension($f, $prefix = '') {
+ public function filterByExtension($f, $prefix = '')
+ {
  foreach ($this->fileExtensions() as $file_extension) {
  if (S::create($f)->endsWith($file_extension)) {
  $prefix = ltrim($prefix, "\\/");
@@ -71,7 +75,8 @@ public function filterByExtension($f, $prefix = '') {
  }
  }
 
- private function fileExtensions() {
+ private function fileExtensions()
+ {
  $extensions = $this->config['config']['file_extensions'];
 
  if (empty($extensions)) {
@@ -85,55 +90,44 @@ public function run($files)
  {
  try {
  $resultFile = tempnam(sys_get_temp_dir(), 'phpcodesniffer');
+ $config_args = array( '-s', '-p' );
 
- $extra_config_options = array('--report-json='.$resultFile);
+ if (isset($this->config['config']['ignore_warnings']) && $this->config['config']['ignore_warnings']) {
+ $config_args[] = '-n';
+ }
+
+ Timing::startTiming();
+
+ $runner = new Runner();
+ $runner->config = new Config($config_args);
 
  if (isset($this->config['config']['standard'])) {
- $extra_config_options[] = '--standard=' . $this->config['config']['standard'];
+ $runner->config->standards = explode(',', $this->config['config']['standard']);
  } else {
- $extra_config_options[] = '--standard=PSR1,PSR2';
- }
-
- if (isset($this->config['config']['ignore_warnings']) && $this->config['config']['ignore_warnings']) {
- $extra_config_options[] = '-n';
+ $runner->config->standards = array('PSR1', 'PSR2');
  }
 
  if (isset($this->config['config']['encoding'])) {
- $extra_config_options[] = '--encoding=' . $this->config['config']['encoding'];
- }
-
- foreach ($files as $file) {
- $extra_config_options[] = $file;
+ $runner->config->encoding = $this->config['config']['encoding'];
  }
 
- // prevent any stdout leakage
- ob_start();
-
- // setup the code sniffer
- $runner = new \PHP_CodeSniffer\Runner();
- $runner->config = new Config($extra_config_options);
+ $runner->config->reports = array( 'json' => null );
+ $runner->config->reportFile = $resultFile;
  $runner->init();
 
- // setup the code sniffer
  $runner->reporter = new Reporter($runner->config);
 
- // start the code sniffing
- Timing::startTiming();
- $runner->checkRequirements();
-
- $todo = new FileList($runner->config, $runner->ruleset);
- foreach ($todo as $path => $file) {
- if ($file->ignored === false) {
- $runner->processFile($file);
- }
+ foreach ($files as $file_path) {
+ $file = new DummyFile(file_get_contents($file_path), $runner->ruleset, $runner->config);
+ $file->path = $file_path;
+ 
+ $runner->processFile($file);
  }
 
- $runner->reporter->printReports();
+ ob_start();
 
- // clean up the output buffers (might be more that one)
- while (ob_get_level()) {
- ob_end_clean();
- }
+ $runner->reporter->printReports();
+ $report = ob_get_clean();
 
  return $resultFile;
  } catch (\Throwable $e) {

circle.yml

@@ -16,16 +16,15 @@
  }
  },
  "require": {
- "squizlabs/php_codesniffer": "^3.5",
+ "squizlabs/php_codesniffer": "^3.5.6",
  "barracudanetworks/forkdaemon-php": "^1.0",
  "danielstjules/stringy": "^2.3",
  "drupal/coder": "^8.3",
- "escapestudios/symfony2-coding-standard": "^3.9",
+ "escapestudios/symfony2-coding-standard": "^3.10",
  "wp-coding-standards/wpcs": "^2.1",
  "yiisoft/yii2-coding-standards": "^2.0",
  "magento/marketplace-eqp": "^4.0",
- "magento/magento-coding-standard": "^4.0"
- "magento/marketplace-eqp": "^1.0",
+ "magento/magento-coding-standard": "^4.0",
  "pheromone/phpcs-security-audit": "^1.0"
  }
 }