php stan, rector, do not test eol php version (#2165)

* php stan, rector, do not test eol php version

* rector

* tests

* Apply php-cs-fixer changes

Co-authored-by: nadar <nadar@users.noreply.github.com>

.github/workflows/tests.yml

@@ -7,6 +7,73 @@ env:
  CC_TEST_REPORTER_ID: e104088a64c54b2a68debe43e4600b48f53a73441e99449223a9fa08c070cf97
 jobs:
 
+ ## PHPSTAN
+ phpstan:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+
+ - name: Install PHP
+ uses: shivammathur/setup-php@2.21.0
+ with:
+ php-version: '8.0'
+ extensions: mbstring, intl
+ coverage: none
+ env:
+ COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ update: true
+
+ - name: Install dependencies
+ run: composer install --prefer-dist --no-interaction --no-progress --optimize-autoloader
+
+ - name: PHPStan tests
+ run: composer phpstan
+
+ ## Rector
+ rector:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+
+ - name: Install PHP
+ uses: shivammathur/setup-php@2.21.0
+ with:
+ php-version: '8.0'
+ extensions: mbstring, intl
+ coverage: none
+ env:
+ COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ update: true
+
+ - name: Install dependencies
+ run: composer install --prefer-dist --no-interaction --no-progress --optimize-autoloader
+
+ - name: Rector tests
+ run: composer rector
+
+ - uses: stefanzweifel/git-auto-commit-action@v4
+ with:
+ commit_message: Apply rector changes
+
+ # PHPCSFIXER
+ php-cs-fixer:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+
+ - name: Install
+ run: composer install
+
+ - name: Run php-cs-fixer
+ run: composer phpcsfixer
+
+ - uses: stefanzweifel/git-auto-commit-action@v4
+ with:
+ commit_message: Apply php-cs-fixer changes
+
  ## PHP UNIT
  phpunit:
  name: PHP ${{ matrix.php }} on ${{ matrix.os }}
@@ -15,7 +82,7 @@ jobs:
  fail-fast: false
  matrix:
  os: [ubuntu-latest]
- php: ['7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
+ php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
 
  services:
  mysql:

core/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
 In order to read more about upgrading and BC breaks have a look at the [UPGRADE Document](UPGRADE.md).
 
+## 2.3.0
+
+> Check the [UPGRADE document](UPGRADE.md) to read more about breaking changes.
+
++ [#2165](https://github.com/luyadev/luya/pull/2165) Official deprecated unit tests for php 7.0, 7.1
+
 ## 2.2.1 (5. October 2022)
 
 + [#2159](https://github.com/luyadev/luya/pull/2159) Added missing option to create menu items with a scheme instead of relative paths.

core/Config.php

@@ -398,7 +398,7 @@ private function appendConfig(&$config, ConfigDefinition $definition)
 
  case ConfigDefinition::GROUP_CALLABLE:
  call_user_func($definition->getConfig(), $this);
- break;
+  break;
  }
  }
 

core/TagParser.php

@@ -139,7 +139,7 @@ private function instantiatTag($tag)
  {
  if (!is_object($this->tags[$tag])) {
  $this->tags[$tag] = Yii::createObject($this->tags[$tag]);
- Yii::debug('tag parser object generated for:'. $tag, __CLASS__);
+ Yii::debug('tag parser object generated for:'. $tag, self::class);
  }
  }
 
@@ -153,8 +153,8 @@ private function parseTag($tag, $context)
  // ensure tag is an object
  $this->instantiatTag($tag);
  // extract context
- $value = isset($context['value']) ? $context['value'] : false;
- $sub = isset($context['sub']) ? $context['sub'] : false;
+ $value = $context['value'] ?? false;
+ $sub = $context['sub'] ?? false;
  // the sub value can contain escaped values, those values must be parsed back into the original state.
  if ($sub) {
  $sub = str_replace(['\)', '\('], [')', '('], $sub);

core/UPGRADE.md

@@ -3,6 +3,10 @@ LUYA UPGRADE
 
 This document will help you upgrading from a LUYA Version into another. For more detailed informations about the breaking changes **click the issue detail link**, there you can examples of how to change your code.
 
+## 2.3.0
+
++ [#2165](https://github.com/luyadev/luya/pull/2165) Official deprecated unit tests for php 7.0, 7.1, 7.2 and 7.3. The minium php version is now 7.4, see [php supported versions](https://www.php.net/supported-versions.php). The code keeps the same and should be backwards compatible but its not official tested anymore.
+
 ## 2.0.0
 
 + [#2068](https://github.com/luyadev/luya/issues/2068) In order to restore the auto register mechanism for csrf tokens either use `ActiveForms` or configure your component:

core/base/Boot.php

@@ -197,8 +197,6 @@ public function run()
 
  /**
  * Run Cli-Application based on the provided config file.
- *
- * @return string|integer
  */
  public function applicationConsole()
  {
@@ -228,7 +226,7 @@ public function applicationConsole()
  'enablePrettyUrl' => true,
  'showScriptName' => false,
  'baseUrl' => $baseUrl,
- 'hostInfo' => isset($config['consoleHostInfo']) ? $config['consoleHostInfo'] : null,
+ 'hostInfo' => $config['consoleHostInfo'] ?? null,
  ],
  ],
  ]);
@@ -241,8 +239,6 @@ public function applicationConsole()
 
  /**
  * Run Web-Application based on the provided config file.
- *
- * @return string Returns the Yii Application run() method if mock is disabled. Otherwise returns void
  */
  public function applicationWeb()
  {

core/base/HookEvent.php

@@ -93,6 +93,6 @@ public function offsetUnset($offset)
  #[\ReturnTypeWillChange]
  public function offsetGet($offset)
  {
- return isset($this->_iterations[$offset]) ? $this->_iterations[$offset] : null;
+ return $this->_iterations[$offset] ?? null;
  }
 }

core/base/Module.php

@@ -382,7 +382,7 @@ public static function registerTranslation($prefix, $basePath, array $fileMap)
  */
  public static function staticBasePath()
  {
- $class = new \ReflectionClass(get_called_class());
+ $class = new \ReflectionClass(static::class);
 
  return dirname($class->getFileName());
  }

core/console/Command.php

@@ -98,7 +98,7 @@ public function selectModule(array $options = [])
  $modules[$id] = $id;
  }
 
- $text = (isset($options['text'])) ? $options['text'] : 'Please select a module:';
+ $text = $options['text'] ?? 'Please select a module:';
 
  return $this->select($text, $modules);
  }

core/console/Importer.php

@@ -101,7 +101,7 @@ public function getModule()
  */
  public function addLog($value)
  {
- $this->getImporter()->addLog(get_called_class(), $value);
+ $this->getImporter()->addLog(static::class, $value);
  }
 
  /**

core/console/commands/HealthController.php

@@ -91,7 +91,6 @@ public function actionIndex()
  /**
  * Test Mail-Component (Use --verbose=1 to enable smtp debug output)
  *
- * @return boolean Whether successfull or not.
  * @throws \Exception On smtp failure
  */
  public function actionMailer()

core/console/commands/views/module/readme.php

@@ -6,9 +6,9 @@
  * @var $ns The namespace where the module is stored in.
  */
 ?># <?= $humanName; ?> Module
- 
+
 <?= $luyaText; ?> 
- 
+
 ## Installation
 
 In order to add the modules to your project go into the modules section of your config:
@@ -25,4 +25,4 @@
  // ...
  ],
 ];
-```
+```

core/texttospeech/TextToSpeechWidget.php

@@ -131,7 +131,7 @@ public function run()
  TextToSpeechAsset::register($this->view);
 
  $config = Json::htmlEncode([
- 'text' => $this->text ? $this->text : '', // must be an empty string as it will checked with .length
+ 'text' => $this->text ?: '', // must be an empty string as it will checked with .length
  'language' => Yii::$app->language,
  ]);
 

core/theme/ThemeManager.php

@@ -177,7 +177,6 @@ protected function getThemeDefinitions()
  }
 
  foreach (Yii::$app->getPackageInstaller()->getConfigs() as $config) {
-
  /** @var PackageConfig $config */
  foreach ($config->themes as $theme) {
  if (strpos($theme, '@') === 0 || strpos($theme, '/') === 0) {

core/traits/ErrorHandlerTrait.php

@@ -178,9 +178,9 @@ public function getExceptionArray($exception)
  } elseif (is_string($exception)) {
  $_message = 'exception string: ' . $exception;
  } elseif (is_array($exception)) {
- $_message = isset($exception['message']) ? $exception['message'] : 'exception array dump: ' . print_r($exception, true);
- $_file = isset($exception['file']) ? $exception['file'] : __FILE__;
- $_line = isset($exception['line']) ? $exception['line'] : __LINE__;
+ $_message = $exception['message'] ?? 'exception array dump: ' . print_r($exception, true);
+ $_file = $exception['file'] ?? __FILE__;
+ $_line = $exception['line'] ?? __LINE__;
  }
 
  $exceptionName = 'Exception';
@@ -195,12 +195,12 @@ public function getExceptionArray($exception)
  'message' => $_message,
  'file' => $_file,
  'line' => $_line,
- 'requestUri' => isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : null,
- 'serverName' => isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : null,
+ 'requestUri' => $_SERVER['REQUEST_URI'] ?? null,
+ 'serverName' => $_SERVER['SERVER_NAME'] ?? null,
  'date' => date('d.m.Y H:i'),
  'trace' => $_trace,
  'previousException' => $_previousException,
- 'ip' => isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null,
+ 'ip' => $_SERVER['REMOTE_ADDR'] ?? null,
  'get' => isset($_GET) ? ArrayHelper::coverSensitiveValues($_GET, $this->sensitiveKeys) : [],
  'post' => isset($_POST) ? ArrayHelper::coverSensitiveValues($_POST, $this->sensitiveKeys) : [],
  'bodyParams' => Yii::$app instanceof Application ? ArrayHelper::coverSensitiveValues(Yii::$app->request->bodyParams) : [],
@@ -252,8 +252,8 @@ private function buildTrace($exception)
  */
  private function buildTraceItem(array $item)
  {
- $file = isset($item['file']) ? $item['file'] : null;
- $line = isset($item['line']) ? $item['line'] : null;
+ $file = $item['file'] ?? null;
+ $line = $item['line'] ?? null;
  $contextLine = null;
  $preContext = [];
  $postContext = [];
@@ -296,8 +296,8 @@ private function buildTraceItem(array $item)
  'context_line' => $contextLine,
  'pre_context' => $preContext,
  'post_context' => $postContext,
- 'function' => isset($item['function']) ? $item['function'] : null,
- 'class' => isset($item['class']) ? $item['class'] : null,
+ 'function' => $item['function'] ?? null,
+ 'class' => $item['class'] ?? null,
  // currently arguments wont be transmited due to large amount of informations based on base object
  //'args' => isset($item['args']) ? ArrayHelper::coverSensitiveValues($item['args'], $this->sensitiveKeys) : [],
  ], function ($value) {

core/traits/RestBehaviorsTrait.php

@@ -128,7 +128,6 @@ public function behaviors()
  unset($behaviors['authenticator']);
 
  if ($this->getUserAuthClass()) {
-
  // change to admin user auth class
  $behaviors['authenticator'] = [
  'class' => CompositeAuth::class,

core/web/Composition.php

@@ -284,7 +284,7 @@ public function getKey($key, $defaultValue = false)
  {
  $this->getKeys();
 
- return isset($this->_keys[$key]) ? $this->_keys[$key] : $defaultValue;
+ return $this->_keys[$key] ?? $defaultValue;
  }
 
  /**

core/web/CompositionResolver.php

@@ -88,7 +88,7 @@ public function getResolvedKeyValue($key)
  {
  $keys = $this->resolvedValues;
 
- return isset($keys[$key]) ? $keys[$key] : false;
+ return $keys[$key] ?? false;
  }
 
  /**

core/web/Controller.php

@@ -37,7 +37,6 @@ public function getViewPath()
  } elseif (is_array($this->module->viewMap)) {
  $currentAction = $this->id . '/' . ($this->action ? $this->action->id : $this->defaultAction);
  foreach ($this->module->viewMap as $action => $viewPath) {
-
  // Special case for map all views of controller
  if ($action === '*') {
  return $viewPath . '/' . $this->id;

core/web/Svg.php

@@ -103,7 +103,6 @@ public function run()
  {
  // Cache generated code
  return $this->getOrSetHasCache(['svg', $this->folder, $this->file, $this->cssClass, $this->symbolName], function () {
-
  // Check if file ends with .svg, if not add the extension
  $svgFile = StringHelper::endsWith($this->file, '.svg') ? $this->file : $this->file . '.svg';
 

core/web/jsonld/AggregateRating.php

@@ -40,7 +40,7 @@ public function setItemReviewed(ThingInterface $thing)
  */
  public function getItemReviewed()
  {
- $this->_itemReviewed;
+ return $this->_itemReviewed;
  }
 
  private $_ratingCount;

core/web/jsonld/EventTrait.php

@@ -102,7 +102,7 @@ public function getComposer()
  */
  public function setComposer($composer)
  {
- ObjectHelper::isInstanceOf($author, [Organization::class, PersonInterface::class]);
+ ObjectHelper::isInstanceOf($composer, [Organization::class, PersonInterface::class]);
 
  $this->_composer = $composer;
  return $this;

core/web/jsonld/GeoCoordinates.php

@@ -26,6 +26,7 @@ public function typeDefintion()
  public function setAddress(PostalAddress $address)
  {
  $this->_address = $address;
+ return $this;
  }
 
  /**

core/web/jsonld/MediaObjectTrait.php

@@ -44,6 +44,7 @@ public function getContentUrl()
  public function setEmbedUrl(UrlValue $url)
  {
  $this->_embedUrl = $url->getValue();
+ return $this;
  }
 
  /**

phpstan.neon

@@ -1,7 +1,9 @@
 parameters:
  level: 0
  paths:
- - src
+ - core
+ excludePaths:
+ - core/vendor
  bootstrapFiles:
  - vendor/yiisoft/yii2/Yii.php
  tmpDir: .tmp

rector.php

@@ -8,7 +8,11 @@
 
 return static function (RectorConfig $rectorConfig): void {
  $rectorConfig->paths([
- __DIR__ . '/src'
+ __DIR__ . '/core'
+ ]);
+
+ $rectorConfig->skip([
+ __DIR__ . '/core/vendor',
  ]);
 
  // register a single rule