PSR2 -> PSR12 formatting

.php-cs-fixer.dist.php

@@ -14,7 +14,7 @@ $config = new PhpCsFixer\Config();
 return $config
     ->setFinder($finder)
     ->setRules(array(
-        '@PSR2' => true,
+        '@PSR12' => true,
         'method_argument_space' => false,           # don't break formatting in initStruct()
         'no_spaces_inside_parenthesis' => false,    # don't break formatting in initStruct()
     ));

ADDITIONS/squirrelmail-plugin/common.php

@@ -1,4 +1,5 @@
 <?php
+
 // vim:ts=4:sw=4:et
 ini_set('include_path', get_include_path() . ':' . dirname(__FILE__));
 

ADDITIONS/squirrelmail-plugin/postfixadmin_changepass.php

@@ -1,4 +1,5 @@
 <?php
+
 require_once(dirname(__FILE__) . '/common.php');
 
 $xmlrpc = get_xmlrpc();

ADDITIONS/squirrelmail-plugin/setup.php

@@ -1,4 +1,5 @@
 <?php
+
 // vim:ts=4:sw=4:et
 if (!defined('SM_PATH')) {
     die("Invalid internal state (don't access file directly)");

languages/index.php

@@ -1,4 +1,5 @@
 <?php
+
 //
 // Postfix Admin
 // by Mischa Peters <mischa at high5 dot net>

model/AdminHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 # $Id$
 
 class AdminHandler extends PFAHandler

model/AdminpasswordHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 # $Id$
 
 class AdminpasswordHandler extends PFAHandler

model/AliasHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 # $Id$
 
 /**

model/AliasdomainHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 # $Id$
 
 /**

model/CliDelete.php

@@ -1,4 +1,5 @@
 <?php
+
 # $Id$
 /**
  * class to handle 'delete' in Cli
@@ -6,7 +7,6 @@
 
 class CliDelete extends Shell
 {
-
     /**
      * Execution method always used for tasks
      */

model/CliEdit.php

@@ -1,4 +1,5 @@
 <?php
+
 # $Id$
 
 /**

model/CliHelp.php

@@ -1,4 +1,5 @@
 <?php
+
 # $Id$
 
 class CliHelp extends Shell
@@ -17,7 +18,7 @@ class CliHelp extends Shell
 
     public function help()
     {
-        $handler = new $this->handler_to_use;
+        $handler = new $this->handler_to_use();
         # TODO: adjust help text according to $handler->taskNames
 
         $module = preg_replace('/Handler$/', '', $this->handler_to_use);

model/CliScheme.php

@@ -1,4 +1,5 @@
 <?php
+
 # $Id$
 /**
  * class to display the database scheme (for usage in upgrade.php) in Cli

model/CliView.php

@@ -1,4 +1,5 @@
 <?php
+
 # $Id$
 /**
  * class to handle 'view' in Cli
@@ -6,7 +7,6 @@
 
 class CliView extends Shell
 {
-
     /**
      * Execution method always used for tasks
      */

model/Config.php

@@ -1,4 +1,5 @@
 <?php
+
 # $Id$
 
 # This class is too static - if you inherit a class from it, it will share the static $instance and all its contents

model/DomainHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 # $Id$
 
 /**

model/FetchmailHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 # $Id$
 
 /**

model/MailboxHandler.php

@@ -1,4 +1,5 @@
 <?php
+
 # $Id$
 
 /**

model/PFAHandler.php

@@ -1,7 +1,7 @@
 <?php
+
 abstract class PFAHandler
 {
-
     /**
      * public variables
      */

model/VacationHandler.php

@@ -1,9 +1,9 @@
 <?php
+
 # $Id$
 
 class VacationHandler extends PFAHandler
 {
-
     /**
      * @var string
      */

public/common.php

@@ -1,2 +1,3 @@
 <?php
+
 require_once(dirname(__FILE__) . '/../common.php');

public/images/index.php

@@ -1,4 +1,5 @@
 <?php
+
 //
 // File: index.php
 //

public/upgrade.php

@@ -1,4 +1,5 @@
 <?php
+
 /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
 
 # Note: run with upgrade.php?debug=1 to see all SQL error messages

public/users/password-change.php

@@ -69,7 +69,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         $error = true;
         flash_error(Config::lang('pPassword_password_text_error'));
     } else {
-        $handler = $context === 'admin' ? new AdminHandler : new MailboxHandler;
+        $handler = $context === 'admin' ? new AdminHandler() : new MailboxHandler();
         if (!$handler->checkPasswordRecoveryCode($tUsername, $tCode)) {
             flash_error(Config::lang('pPassword_code_text_error'));
         } else {

public/xmlrpc.php

@@ -69,7 +69,6 @@ echo $server->handle();
 
 class UserProxy
 {
-
     /**
      * @param string $old_password
      * @param string $new_password

scripts/postfixadmin-cli.php

@@ -208,7 +208,7 @@ class PostfixAdmin
         # TODO: add a way to Cli* to signal if the selected handler is supported (for example, not all *Handler support changing the password)
 
         if (strtolower(get_parent_class($shell)) == 'shell') {
-            $handler = new $shell->handler_to_use;
+            $handler = new $shell->handler_to_use();
             if (in_array($task, $handler->taskNames)) {
                 $this->shiftArgs();
                 $shell->startup();

scripts/snippets/crypt.php

@@ -2,7 +2,6 @@
 
 class Crypt
 {
-
   /**
    * @access private
    */

tests/RemoteVacationTest.php

@@ -9,8 +9,6 @@ require_once('RemoteTest.php');
 
 class RemoteVacationTest extends RemoteTest
 {
-
-
     /**
      * Adds the test recipient data to the database.
      */