INFRA-132 - Civi - PHPStorm cleanup

diff --git a/Civi/API/Provider/AdhocProvider.php b/Civi/API/Provider/AdhocProvider.php
index c981ef21d3d72f83bf8b4c297ecf48b844adb754..7bb62be87ffd173c69cbc0b5c670acda2d2e4694 100644 (file)
--- a/Civi/API/Provider/AdhocProvider.php
+++ b/Civi/API/Provider/AdhocProvider.php
@@ -26,6 +26,7 @@
 */
 
 namespace Civi\API\Provider;
+
 use Civi\API\Events;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 

diff --git a/Civi/API/Provider/ProviderInterface.php b/Civi/API/Provider/ProviderInterface.php
index e17ca8c269ffe5b52976cd64d12ada2e35048334..94432c66f7f1789264c4081e7adb9e6e34f51173 100644 (file)
--- a/Civi/API/Provider/ProviderInterface.php
+++ b/Civi/API/Provider/ProviderInterface.php
@@ -26,6 +26,7 @@
 */
 
 namespace Civi\API\Provider;
+
 use Civi\API\Events;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 

diff --git a/Civi/API/Subscriber/ChainSubscriber.php b/Civi/API/Subscriber/ChainSubscriber.php
index 93a2d3454098f9d2af82fc408776a6c2f7b5c402..74488e2d91d6db70482a9946437fd8189e7dd6b7 100644 (file)
--- a/Civi/API/Subscriber/ChainSubscriber.php
+++ b/Civi/API/Subscriber/ChainSubscriber.php
@@ -26,6 +26,7 @@
 */
 
 namespace Civi\API\Subscriber;
+
 use Civi\API\Events;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 

diff --git a/Civi/API/Subscriber/PermissionCheck.php b/Civi/API/Subscriber/PermissionCheck.php
index ebd080f56d71708a716f40253309991cf61f5ed2..68485e301fee83fdbdecc2add9389c30457fb2b7 100644 (file)
--- a/Civi/API/Subscriber/PermissionCheck.php
+++ b/Civi/API/Subscriber/PermissionCheck.php
@@ -26,6 +26,7 @@
 */
 
 namespace Civi\API\Subscriber;
+
 use Civi\API\Events;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 

diff --git a/Civi/API/Subscriber/XDebugSubscriber.php b/Civi/API/Subscriber/XDebugSubscriber.php
index 316a4650df583e78310db4bd38250f3a799ea071..2dc1ba6a00aa5e4433528a51c175c56f32375426 100644 (file)
--- a/Civi/API/Subscriber/XDebugSubscriber.php
+++ b/Civi/API/Subscriber/XDebugSubscriber.php
@@ -26,6 +26,7 @@
 */
 
 namespace Civi\API\Subscriber;
+
 use Civi\API\Events;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 

diff --git a/Civi/CCase/SequenceListener.php b/Civi/CCase/SequenceListener.php
index 7b40e7fbc679604449fdf21fd152686359756f11..7f83ebb6fe75d73afb5d631412003fad2bd432a3 100644 (file)
--- a/Civi/CCase/SequenceListener.php
+++ b/Civi/CCase/SequenceListener.php
@@ -58,7 +58,7 @@ class SequenceListener implements CaseChangeListener {
 
     // OK, the activity has completed every step in the sequence!
     civicrm_api3('Case', 'create', array(
-      'id'  => $analyzer->getCaseId(),
+      'id' => $analyzer->getCaseId(),
       'status_id' => 'Closed',
     ));
     $analyzer->flush();

diff --git a/Civi/CiUtil/PHPUnitScanner.php b/Civi/CiUtil/PHPUnitScanner.php
index 45751af58b8b00d66603b4bebc71c262660d76be..6b25edab3705cc7a222c62161dc3b0d78e3aba2e 100644 (file)
--- a/Civi/CiUtil/PHPUnitScanner.php
+++ b/Civi/CiUtil/PHPUnitScanner.php
@@ -1,5 +1,6 @@
 <?php
 namespace Civi\CiUtil;
+
 use Symfony\Component\Finder\Finder;
 
 /**

diff --git a/Civi/Core/Container.php b/Civi/Core/Container.php
index 5d951e19d0ee11a055b4326bb516ae45ba17e238..8c3d7f8405fd9d2e78fa685f4aee0760dfdad4b6 100644 (file)
--- a/Civi/Core/Container.php
+++ b/Civi/Core/Container.php
@@ -1,5 +1,6 @@
 <?php
 namespace Civi\Core;
+
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\Common\Annotations\FileCacheReader;
@@ -97,7 +98,10 @@ class Container {
     $dispatcher->addListener('DAO::post-insert', array('\CRM_Core_BAO_RecurringEntity', 'triggerInsert'));
     $dispatcher->addListener('DAO::post-update', array('\CRM_Core_BAO_RecurringEntity', 'triggerUpdate'));
     $dispatcher->addListener('DAO::post-delete', array('\CRM_Core_BAO_RecurringEntity', 'triggerDelete'));
-    $dispatcher->addListener('hook_civicrm_unhandled_exception', array('CRM_Core_LegacyErrorHandler', 'handleException'));
+    $dispatcher->addListener('hook_civicrm_unhandled_exception', array(
+        'CRM_Core_LegacyErrorHandler',
+        'handleException'
+      ));
     return $dispatcher;
   }
 

diff --git a/Civi/Core/Transaction/Frame.php b/Civi/Core/Transaction/Frame.php
index 0bc95c0527d3ab30b3bae13464c850e8d2aca19a..ea0a8b9e7d9c3247ecdd9adfd6ca656c6b10403c 100644 (file)
--- a/Civi/Core/Transaction/Frame.php
+++ b/Civi/Core/Transaction/Frame.php
@@ -108,7 +108,7 @@ class Frame {
   }
 
   public function setRollbackOnly() {
-    $this->doCommit = false;
+    $this->doCommit = FALSE;
   }
 
   public function begin() {
@@ -163,7 +163,7 @@ class Frame {
    * @param array|NULL $params Optional values to pass to callback.
    *          See php manual call_user_func_array for details.
    */
-  public function addCallback($phase, $callback, $params = null, $id = NULL) {
+  public function addCallback($phase, $callback, $params = NULL, $id = NULL) {
     if ($id) {
       $this->callbacks[$phase][$id] = array(
         'callback' => $callback,

diff --git a/Civi/Core/Transaction/Manager.php b/Civi/Core/Transaction/Manager.php
index f7ff620095188daaca57b74a246a25d9a3dd3829..7b2ca2dc64984d12059d965409a1eeaaa9047f98 100644 (file)
--- a/Civi/Core/Transaction/Manager.php
+++ b/Civi/Core/Transaction/Manager.php
@@ -161,8 +161,7 @@ class Manager {
    * @return \Civi\Core\Transaction\Frame
    */
   protected function createBaseFrame() {
-    return new Frame($this->dao, 'BEGIN', 'COMMIT', 'ROLLBACK');
-    ;
+    return new Frame($this->dao, 'BEGIN', 'COMMIT', 'ROLLBACK');;
   }
 
   /**

diff --git a/Civi/Install/Requirements.php b/Civi/Install/Requirements.php
index 8d4a6af612aeeedfe945dd24c88a6a4e960030a2..3cb0da52e4f4af2eb16de95ae841b0984bdf1774 100644 (file)
--- a/Civi/Install/Requirements.php
+++ b/Civi/Install/Requirements.php
@@ -481,7 +481,7 @@ class Requirements {
     $conn = @mysql_connect($db_config['server'], $db_config['username'], $db_config['password']);
     if (!$conn) {
       $results['severity'] = $this::REQUIREMENT_ERROR;
-      $results['details'] =  'Could not connect to database';
+      $results['details'] = 'Could not connect to database';
       return $results;
     }
 

diff --git a/Civi/Payment/System.php b/Civi/Payment/System.php
index 18d66651ca582174fe28f60c7aa2212ebacfb846..f72aaab48d7a73662946480ad1449de66adb630f 100644 (file)
--- a/Civi/Payment/System.php
+++ b/Civi/Payment/System.php
@@ -57,6 +57,7 @@ class System {
     }
     return $this->cache[$id];
   }
+
   /**
    * @param integer $id
    * @throws \CiviCRM_API3_Exception