Upgrade to php-cs-fixer 3.x. Add visibility to const (requires php 7.1)

Author: ctrlaltca

.gitignore

@@ -1,6 +1,6 @@
 /.buildpath
 /.idea
-/.php_cs.cache
+/.php-cs-fixer.cache
 /.phpunit.result.cache
 atlassian-ide-plugin.xml
 /.project

.php_cs renamed to .php-cs-fixer.dist.php

@@ -1,6 +1,14 @@
 <?php
 
-$config = PhpCsFixer\Config::create()
+$finder = PhpCsFixer\Finder::create()
+	->exclude('build/')
+	->exclude('docs/')
+	->exclude('tests/')
+	->exclude('vendor/')
+	->in(__DIR__);
+
+$config = new PhpCsFixer\Config();
+$config
 	->setRiskyAllowed(true)
     ->setIndent("\t")
     ->setLineEnding("\n")
@@ -25,21 +33,13 @@
 		'phpdoc_order' => true,
 		'phpdoc_scalar' => true,
 		'phpdoc_types_order' => true,
-		'psr4' => true,
+		'psr_autoloading' => true,
 		'ternary_operator_spaces' => true,
 		'ternary_to_null_coalescing' => true,
 		'trim_array_spaces' => true,
 		'visibility_required' => true,
 		'whitespace_after_comma_in_array' => true,
 	])
-	->setFinder(
-		PhpCsFixer\Finder::create()
-			->exclude('build/')
-			->exclude('docs/')
-			->exclude('tests/')
-			->exclude('vendor/')
-			->in(__DIR__)
-	)
-;
+	->setFinder($finder);
 
 return $config;

framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputBase.php

@@ -21,7 +21,7 @@
 
 class TScaffoldInputBase
 {
-	const DEFAULT_ID = 'scaffold_input';
+	public const DEFAULT_ID = 'scaffold_input';
 	private $_parent;
 
 	protected function getParent()

framework/Data/ActiveRecord/TActiveRecord.php

@@ -149,14 +149,14 @@
  */
 abstract class TActiveRecord extends \Prado\TComponent
 {
-	const BELONGS_TO = 'BELONGS_TO';
-	const HAS_ONE = 'HAS_ONE';
-	const HAS_MANY = 'HAS_MANY';
-	const MANY_TO_MANY = 'MANY_TO_MANY';
-
-	const STATE_NEW = 0;
-	const STATE_LOADED = 1;
-	const STATE_DELETED = 2;
+	public const BELONGS_TO = 'BELONGS_TO';
+	public const HAS_ONE = 'HAS_ONE';
+	public const HAS_MANY = 'HAS_MANY';
+	public const MANY_TO_MANY = 'MANY_TO_MANY';
+
+	public const STATE_NEW = 0;
+	public const STATE_LOADED = 1;
+	public const STATE_DELETED = 2;
 
 	/**
 	 * @var int record state: 0 = new, 1 = loaded, 2 = deleted.

framework/Data/ActiveRecord/TActiveRecordConfig.php

@@ -72,8 +72,8 @@
  */
 class TActiveRecordConfig extends TDataSourceConfig
 {
-	const DEFAULT_MANAGER_CLASS = '\Prado\Data\ActiveRecord\TActiveRecordManager';
-	const DEFAULT_GATEWAY_CLASS = '\Prado\Data\ActiveRecord\TActiveRecordGateway';
+	public const DEFAULT_MANAGER_CLASS = '\Prado\Data\ActiveRecord\TActiveRecordManager';
+	public const DEFAULT_GATEWAY_CLASS = '\Prado\Data\ActiveRecord\TActiveRecordGateway';
 
 	/**
 	 * Defaults to {@link TActiveRecordConfig::DEFAULT_GATEWAY_CLASS DEFAULT_MANAGER_CLASS}

framework/Data/ActiveRecord/TActiveRecordGateway.php

@@ -31,7 +31,7 @@
  */
 class TActiveRecordGateway extends \Prado\TComponent
 {
-	const DEFAULT_DATA_GATEWAY_CLASS = '\Prado\Data\DataGateway\TDataGatewayCommand';
+	public const DEFAULT_DATA_GATEWAY_CLASS = '\Prado\Data\DataGateway\TDataGatewayCommand';
 
 	/**
 	 * Defaults to {@link TActiveRecordGateway::DEFAULT_GATEWAY_CLASS DEFAULT_GATEWAY_CLASS}
@@ -47,11 +47,11 @@ class TActiveRecordGateway extends \Prado\TComponent
 	/**
 	 * Constant name for specifying optional table name in TActiveRecord.
 	 */
-	const TABLE_CONST = 'TABLE';
+	public const TABLE_CONST = 'TABLE';
 	/**
 	 * Method name for returning optional table name in in TActiveRecord
 	 */
-	const TABLE_METHOD = 'table';
+	public const TABLE_METHOD = 'table';
 
 	/**
 	 * Record gateway constructor.

framework/Data/ActiveRecord/TActiveRecordInvalidFinderResult.php

@@ -28,6 +28,6 @@
  */
 class TActiveRecordInvalidFinderResult extends \Prado\TEnumerable
 {
-	const Null = 'Null';
-	const Exception = 'Exception';
+	public const Null = 'Null';
+	public const Exception = 'Exception';
 }

framework/Data/ActiveRecord/TActiveRecordManager.php

@@ -35,7 +35,7 @@
  */
 class TActiveRecordManager extends \Prado\TComponent
 {
-	const DEFAULT_GATEWAY_CLASS = '\Prado\Data\ActiveRecord\TActiveRecordGateway';
+	public const DEFAULT_GATEWAY_CLASS = '\Prado\Data\ActiveRecord\TActiveRecordGateway';
 
 	/**
 	 * Defaults to {@link TActiveRecordManager::DEFAULT_GATEWAY_CLASS DEFAULT_GATEWAY_CLASS}

framework/Data/Common/Mssql/TMssqlMetaData.php

@@ -26,7 +26,7 @@
  */
 class TMssqlMetaData extends TDbMetaData
 {
-	const DEFAULT_SCHEMA = 'dbo';
+	public const DEFAULT_SCHEMA = 'dbo';
 
 	/**
 	 * @return string TDbTableInfo class name.

framework/Data/Common/TDbTableColumn.php

@@ -21,7 +21,7 @@
  */
 class TDbTableColumn extends \Prado\TComponent
 {
-	const UNDEFINED_VALUE = INF; //use infinity for undefined value
+	public const UNDEFINED_VALUE = INF; //use infinity for undefined value
 
 	private $_info = [];