add(phpcs) psr12 and fully_qualified_strict_types

Author: connorhu

.php-cs-fixer.dist.php

@@ -1,6 +1,9 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$finder = Finder::create()
     ->ignoreVCSIgnored(true)
     ->in(__DIR__.'/lib')
     ->in(__DIR__.'/data/bin')
@@ -14,13 +17,18 @@
     ->notPath('unit/config/fixtures/sfFilterConfigHandler/result.php')
 ;
 
-$config = new PhpCsFixer\Config();
+$config = new Config();
 $config->setRules([
     '@PhpCsFixer' => true,
     '@Symfony' => true,
+    '@PSR12' => true,
     'array_syntax' => [
         'syntax' => 'short',
     ],
+    'fully_qualified_strict_types' => [
+        'import_symbols' => true,
+        'leading_backslash_in_global_namespace' => true,
+    ],
 ])
     ->setCacheFile('.php-cs-fixer.cache')
     ->setFinder($finder)

data/bin/changelog.php

@@ -31,16 +31,16 @@
     exit(1);
 }
 
-$filesystem = new sfFilesystem();
+$filesystem = new \sfFilesystem();
 
 list($out, $err) = $filesystem->execute('svn info --xml');
-$info = new SimpleXMLElement($out);
+$info = new \SimpleXMLElement($out);
 
 list($out, $err) = $filesystem->execute(vsprintf('svn log %s --xml %s', array_map('escapeshellarg', [
     $argv[1],
     (string) $info->entry->repository->root.$argv[2],
 ])));
-$log = new SimpleXMLElement($out);
+$log = new \SimpleXMLElement($out);
 
 foreach ($log->logentry as $logentry) {
     echo sprintf(' * [%d] %s', $logentry['revision'], trim(preg_replace('/\s*\[[\d\., ]+\]\s*/', '', (string) $logentry->msg)));

data/bin/check_configuration.php

@@ -7,11 +7,6 @@ function is_cli()
 
 /**
  * Checks a configuration.
- *
- * @param mixed $boolean
- * @param mixed $message
- * @param mixed $help
- * @param mixed $fatal
  */
 function check($boolean, $message, $help = '', $fatal = false)
 {
@@ -72,7 +67,7 @@ function get_ini_path()
 echo "\n** Optional checks **\n\n";
 check(class_exists('PDO'), 'PDO is installed', 'Install PDO (mandatory for Doctrine)', false);
 if (class_exists('PDO')) {
-    $drivers = PDO::getAvailableDrivers();
+    $drivers = \PDO::getAvailableDrivers();
     check(count($drivers), 'PDO has some drivers installed: '.implode(', ', $drivers), 'Install PDO drivers (mandatory for Doctrine)');
 }
 check(function_exists('token_get_all'), 'The token_get_all() function is available', 'Install and enable the Tokenizer extension (highly recommended)', false);

data/bin/release.php

@@ -26,16 +26,16 @@
 require_once __DIR__.'/../../lib/vendor/lime/lime.php';
 
 if (!isset($argv[1])) {
-    throw new Exception('You must provide version prefix.');
+    throw new \Exception('You must provide version prefix.');
 }
 
 if (!isset($argv[2])) {
-    throw new Exception('You must provide stability status (alpha/beta/stable).');
+    throw new \Exception('You must provide stability status (alpha/beta/stable).');
 }
 
 $stability = $argv[2];
 
-$filesystem = new sfFilesystem();
+$filesystem = new \sfFilesystem();
 
 if (('beta' == $stability || 'alpha' == $stability) && count(explode('.', $argv[1])) < 2) {
     $version_prefix = $argv[1];
@@ -46,7 +46,7 @@
     }
 
     if (!isset($version)) {
-        throw new Exception('Unable to find last SVN revision.');
+        throw new \Exception('Unable to find last SVN revision.');
     }
 
     // make a PEAR compatible version
@@ -61,7 +61,7 @@
 list($result) = $filesystem->execute('php data/bin/symfony symfony:test');
 
 if (0 != $result) {
-    throw new Exception('Some tests failed. Release process aborted!');
+    throw new \Exception('Some tests failed. Release process aborted!');
 }
 
 if (is_file('package.xml')) {
@@ -71,7 +71,7 @@
 $filesystem->copy(getcwd().'/package.xml.tmpl', getcwd().'/package.xml');
 
 // add class files
-$finder = sfFinder::type('file')->relative();
+$finder = \sfFinder::type('file')->relative();
 $xml_classes = '';
 $dirs = ['lib' => 'php', 'data' => 'data'];
 foreach ($dirs as $dir => $role) {

data/bin/sandbox_installer.php

@@ -3,13 +3,13 @@
 $this->installDir(__DIR__.'/sandbox_skeleton');
 
 $this->logSection('install', 'add symfony CLI for Windows users');
-$this->getFilesystem()->copy(__DIR__.'/symfony.bat', sfConfig::get('sf_root_dir').'/symfony.bat');
+$this->getFilesystem()->copy(__DIR__.'/symfony.bat', \sfConfig::get('sf_root_dir').'/symfony.bat');
 
 $this->logSection('install', 'add LICENSE');
-$this->getFilesystem()->copy(__DIR__.'/../../LICENSE', sfConfig::get('sf_root_dir').'/LICENSE');
+$this->getFilesystem()->copy(__DIR__.'/../../LICENSE', \sfConfig::get('sf_root_dir').'/LICENSE');
 
 $this->logSection('install', 'default to sqlite');
-$this->runTask('configure:database', sprintf("'sqlite:%s/sandbox.db'", sfConfig::get('sf_data_dir')));
+$this->runTask('configure:database', sprintf("'sqlite:%s/sandbox.db'", \sfConfig::get('sf_data_dir')));
 
 $this->logSection('install', 'create an application');
 $this->runTask('generate:app', 'frontend');
@@ -18,13 +18,13 @@
 $this->runTask('plugin:publish-assets');
 
 $this->logSection('install', 'fix sqlite database permissions');
-touch(sfConfig::get('sf_data_dir').'/sandbox.db');
-chmod(sfConfig::get('sf_data_dir'), 0777);
-chmod(sfConfig::get('sf_data_dir').'/sandbox.db', 0777);
+touch(\sfConfig::get('sf_data_dir').'/sandbox.db');
+chmod(\sfConfig::get('sf_data_dir'), 0777);
+chmod(\sfConfig::get('sf_data_dir').'/sandbox.db', 0777);
 
 $this->logSection('install', 'add an empty file in empty directories');
 $seen = [];
-foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(sfConfig::get('sf_root_dir')), RecursiveIteratorIterator::CHILD_FIRST) as $path => $item) {
+foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(\sfConfig::get('sf_root_dir')), \RecursiveIteratorIterator::CHILD_FIRST) as $path => $item) {
     if (!isset($seen[$path]) && $item->isDir() && !$item->isLink()) {
         touch($item->getRealPath().'/.sf');
     }