tfboe / fm-lib

src/Helpers/Logging.php

Indentation +14 added lines, -14 removed lines

@@ -38,20 +38,20 @@
    */
   public static function log(string $message, string $logger = Logs::GENERAL, int $type = Logger::INFO)
   {
-    if (self::$testing && $logger !== Logs::TESTING) {
-      //do nothing
-      return;
-    }
-    Logs::ensureValidValue($logger);
-    if (!array_key_exists($logger, self::$loggers)) {
-      self::$loggers[$logger] = new Logger($logger);
-      // InvalidArgumentException => stream is a string
-      // Exception => path is static and it is ensured that it is valid
-      /** @noinspection PhpUnhandledExceptionInspection */
-      self::$loggers[$logger]->pushHandler(
-        new StreamHandler((self::$storagePathFunction)() . '/logs/' . $logger . '.log'));
-    }
-    self::$loggers[$logger]->log($type, $message);
+	if (self::$testing && $logger !== Logs::TESTING) {
+	  //do nothing
+	  return;
+	}
+	Logs::ensureValidValue($logger);
+	if (!array_key_exists($logger, self::$loggers)) {
+	  self::$loggers[$logger] = new Logger($logger);
+	  // InvalidArgumentException => stream is a string
+	  // Exception => path is static and it is ensured that it is valid
+	  /** @noinspection PhpUnhandledExceptionInspection */
+	  self::$loggers[$logger]->pushHandler(
+		new StreamHandler((self::$storagePathFunction)() . '/logs/' . $logger . '.log'));
+	}
+	self::$loggers[$logger]->log($type, $message);
   }
 //</editor-fold desc="Public Methods">
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * Created by PhpStorm.
  * User: benedikt
@@ -36,20 +36,20 @@ 
    * @param int $type the type of the message
    * @throws \Tfboe\FmLib\Exceptions\ValueNotValid invalid logger
    */
-  public static function log(string $message, string $logger = Logs::GENERAL, int $type = Logger::INFO)
+  public static function log( string $message, string $logger = Logs::GENERAL, int $type = Logger::INFO )
   {
-    if (self::$testing && $logger !== Logs::TESTING) {
+    if ( self::$testing && $logger !== Logs::TESTING ) {
       //do nothing
       return;
     }
     Logs::ensureValidValue($logger);
-    if (!array_key_exists($logger, self::$loggers)) {
+    if ( !array_key_exists($logger, self::$loggers) ) {
       self::$loggers[$logger] = new Logger($logger);
       // InvalidArgumentException => stream is a string
       // Exception => path is static and it is ensured that it is valid
       /** @noinspection PhpUnhandledExceptionInspection */
       self::$loggers[$logger]->pushHandler(
-        new StreamHandler((self::$storagePathFunction)() . '/logs/' . $logger . '.log'));
+        new StreamHandler((self::$storagePathFunction)().'/logs/'.$logger.'.log'));
     }
     self::$loggers[$logger]->log($type, $message);
   }

Braces +2 added lines, -4 removed lines

@@ -17,8 +17,7 @@ 
  * Class Logging
  * @package Tfboe\FmLib\Helpers
  */
-abstract class Logging
-{
+abstract class Logging {
 //<editor-fold desc="Fields">
   /** @var bool */
   public static $testing = false;
@@ -36,8 +35,7 @@ 
    * @param int $type the type of the message
    * @throws \Tfboe\FmLib\Exceptions\ValueNotValid invalid logger
    */
-  public static function log(string $message, string $logger = Logs::GENERAL, int $type = Logger::INFO)
-  {
+  public static function log(string $message, string $logger = Logs::GENERAL, int $type = Logger::INFO) {
     if (self::$testing && $logger !== Logs::TESTING) {
       //do nothing
       return;

src/Helpers/Logs.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * Created by PhpStorm.
  * User: benedikt

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
  * Class Logs
  * @package Tfboe\FmLib\Helpers
  */
-abstract class Logs extends BasicEnum
-{
+abstract class Logs extends BasicEnum {
 //<editor-fold desc="Fields">
   const GENERAL = "general";
   const TESTING = "testing";

src/Helpers/Level.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * Created by PhpStorm.
  * User: benedikt

Braces +1 added lines, -2 removed lines

@@ -14,8 +14,7 @@
  * Class Level
  * @package Tfboe\FmLib\Helpers
  */
-abstract class Level extends BasicEnum
-{
+abstract class Level extends BasicEnum {
 //<editor-fold desc="Fields">
   const COMPETITION = 3;
   const GAME = 0;

src/Helpers/BasicEnum.php

Indentation +51 added lines, -51 removed lines

@@ -34,9 +34,9 @@ 
    */
   public static function ensureValidValue($value, bool $strict = true): void
   {
-    if (!self::isValidValue($value, $strict)) {
-      throw new ValueNotValid($value, get_called_class());
-    }
+	if (!self::isValidValue($value, $strict)) {
+	  throw new ValueNotValid($value, get_called_class());
+	}
   }
 
   /**
@@ -45,7 +45,7 @@ 
    */
   public static function getNames(): array
   {
-    return array_keys(self::getConstants());
+	return array_keys(self::getConstants());
   }
 
   /**
@@ -57,20 +57,20 @@ 
    */
   public static function getValue(string $name, bool $strict = false)
   {
-    $constants = self::getConstants();
-    if ($strict) {
-      if (array_key_exists($name, $constants)) {
-        return $constants[$name];
-      }
-    } else {
-      $mapping = self::getCaseMapping();
-      $key = strtolower($name);
-      if (array_key_exists($key, $mapping)) {
-        return $constants[$mapping[$key]];
-      }
-    }
-
-    throw new ValueNotValid($name, get_called_class(), "getValues");
+	$constants = self::getConstants();
+	if ($strict) {
+	  if (array_key_exists($name, $constants)) {
+		return $constants[$name];
+	  }
+	} else {
+	  $mapping = self::getCaseMapping();
+	  $key = strtolower($name);
+	  if (array_key_exists($key, $mapping)) {
+		return $constants[$mapping[$key]];
+	  }
+	}
+
+	throw new ValueNotValid($name, get_called_class(), "getValues");
   }
 
   /**
@@ -79,7 +79,7 @@ 
    */
   public static function getValues(): array
   {
-    return array_values(self::getConstants());
+	return array_values(self::getConstants());
   }
 
   /**
@@ -90,14 +90,14 @@ 
    */
   public static function isValidName(string $name, bool $strict = false): bool
   {
-    $constants = self::getConstants();
+	$constants = self::getConstants();
 
-    if ($strict) {
-      return array_key_exists($name, $constants);
-    }
+	if ($strict) {
+	  return array_key_exists($name, $constants);
+	}
 
-    $keys = array_map('strtolower', array_keys($constants));
-    return in_array(strtolower($name), $keys);
+	$keys = array_map('strtolower', array_keys($constants));
+	return in_array(strtolower($name), $keys);
   }
 
   /**
@@ -108,8 +108,8 @@ 
    */
   public static function isValidValue($value, bool $strict = true): bool
   {
-    $values = self::getValues();
-    return in_array($value, $values, $strict);
+	$values = self::getValues();
+	return in_array($value, $values, $strict);
   }
 //</editor-fold desc="Public Methods">
 
@@ -121,17 +121,17 @@ 
    */
   private static function getCaseMapping(): array
   {
-    if (self::$constCacheArrayCaseMapping == NULL) {
-      self::$constCacheArrayCaseMapping = [];
-    }
-    $calledClass = get_called_class();
-    if (!array_key_exists($calledClass, self::$constCacheArrayCaseMapping)) {
-      self::$constCacheArrayCaseMapping[$calledClass] = [];
-      foreach (self::getNames() as $name) {
-        self::$constCacheArrayCaseMapping[$calledClass][strtolower($name)] = $name;
-      }
-    }
-    return self::$constCacheArrayCaseMapping[$calledClass];
+	if (self::$constCacheArrayCaseMapping == NULL) {
+	  self::$constCacheArrayCaseMapping = [];
+	}
+	$calledClass = get_called_class();
+	if (!array_key_exists($calledClass, self::$constCacheArrayCaseMapping)) {
+	  self::$constCacheArrayCaseMapping[$calledClass] = [];
+	  foreach (self::getNames() as $name) {
+		self::$constCacheArrayCaseMapping[$calledClass][strtolower($name)] = $name;
+	  }
+	}
+	return self::$constCacheArrayCaseMapping[$calledClass];
   }
 
   /** @noinspection PhpDocMissingThrowsInspection */ //ReflectionException
@@ -141,19 +141,19 @@ 
    */
   private static function getConstants(): array
   {
-    if (self::$constCacheArray == NULL) {
-      self::$constCacheArray = [];
-    }
-    $calledClass = get_called_class();
-    if (!array_key_exists($calledClass, self::$constCacheArray)) {
-      // ReflectionException => whe know that calledClass is a valid class since it is the result of get_called_class
-      /** @noinspection PhpUnhandledExceptionInspection */
-      $reflect = new \ReflectionClass($calledClass);
-      $array = $reflect->getConstants();
-      asort($array);
-      self::$constCacheArray[$calledClass] = $array;
-    }
-    return self::$constCacheArray[$calledClass];
+	if (self::$constCacheArray == NULL) {
+	  self::$constCacheArray = [];
+	}
+	$calledClass = get_called_class();
+	if (!array_key_exists($calledClass, self::$constCacheArray)) {
+	  // ReflectionException => whe know that calledClass is a valid class since it is the result of get_called_class
+	  /** @noinspection PhpUnhandledExceptionInspection */
+	  $reflect = new \ReflectionClass($calledClass);
+	  $array = $reflect->getConstants();
+	  asort($array);
+	  self::$constCacheArray[$calledClass] = $array;
+	}
+	return self::$constCacheArray[$calledClass];
   }
 //</editor-fold desc="Private Methods">
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * Created by PhpStorm.
  * User: benedikt
@@ -32,9 +32,9 @@ 
    * @param bool $strict if yes type checks are performed
    * @throws ValueNotValid if the value is not valid
    */
-  public static function ensureValidValue($value, bool $strict = true): void
+  public static function ensureValidValue( $value, bool $strict = true ): void
   {
-    if (!self::isValidValue($value, $strict)) {
+    if ( !self::isValidValue($value, $strict) ) {
       throw new ValueNotValid($value, get_called_class());
     }
   }
@@ -55,17 +55,17 @@ 
    * @return mixed the corresponding value
    * @throws ValueNotValid if the name is not valid
    */
-  public static function getValue(string $name, bool $strict = false)
+  public static function getValue( string $name, bool $strict = false )
   {
     $constants = self::getConstants();
-    if ($strict) {
-      if (array_key_exists($name, $constants)) {
+    if ( $strict ) {
+      if ( array_key_exists($name, $constants) ) {
         return $constants[$name];
       }
     } else {
       $mapping = self::getCaseMapping();
       $key = strtolower($name);
-      if (array_key_exists($key, $mapping)) {
+      if ( array_key_exists($key, $mapping) ) {
         return $constants[$mapping[$key]];
       }
     }
@@ -88,11 +88,11 @@ 
    * @param bool $strict if yes check is done case sensitive and otherwise case insensitive
    * @return bool true if the name is part of the enum and false otherwise
    */
-  public static function isValidName(string $name, bool $strict = false): bool
+  public static function isValidName( string $name, bool $strict = false ): bool
   {
     $constants = self::getConstants();
 
-    if ($strict) {
+    if ( $strict ) {
       return array_key_exists($name, $constants);
     }
 
@@ -106,7 +106,7 @@ 
    * @param bool $strict if yes type checks are performed
    * @return bool true if the value is part of the enum and false otherwise
    */
-  public static function isValidValue($value, bool $strict = true): bool
+  public static function isValidValue( $value, bool $strict = true ): bool
   {
     $values = self::getValues();
     return in_array($value, $values, $strict);
@@ -121,13 +121,13 @@ 
    */
   private static function getCaseMapping(): array
   {
-    if (self::$constCacheArrayCaseMapping == NULL) {
+    if ( self::$constCacheArrayCaseMapping == NULL ) {
       self::$constCacheArrayCaseMapping = [];
     }
     $calledClass = get_called_class();
-    if (!array_key_exists($calledClass, self::$constCacheArrayCaseMapping)) {
+    if ( !array_key_exists($calledClass, self::$constCacheArrayCaseMapping) ) {
       self::$constCacheArrayCaseMapping[$calledClass] = [];
-      foreach (self::getNames() as $name) {
+      foreach ( self::getNames() as $name ) {
         self::$constCacheArrayCaseMapping[$calledClass][strtolower($name)] = $name;
       }
     }
@@ -141,11 +141,11 @@ 
    */
   private static function getConstants(): array
   {
-    if (self::$constCacheArray == NULL) {
+    if ( self::$constCacheArray == NULL ) {
       self::$constCacheArray = [];
     }
     $calledClass = get_called_class();
-    if (!array_key_exists($calledClass, self::$constCacheArray)) {
+    if ( !array_key_exists($calledClass, self::$constCacheArray) ) {
       // ReflectionException => whe know that calledClass is a valid class since it is the result of get_called_class
       /** @noinspection PhpUnhandledExceptionInspection */
       $reflect = new \ReflectionClass($calledClass);

Braces +2 added lines, -4 removed lines

@@ -15,8 +15,7 @@ 
  * Class BasicEnum
  * @package Tfboe\FmLib\Entity\Categories
  */
-abstract class BasicEnum
-{
+abstract class BasicEnum {
 //<editor-fold desc="Fields">
   /** @var null|mixed[][] */
   private static $constCacheArray = NULL;
@@ -55,8 +54,7 @@ 
    * @return mixed the corresponding value
    * @throws ValueNotValid if the name is not valid
    */
-  public static function getValue(string $name, bool $strict = false)
-  {
+  public static function getValue(string $name, bool $strict = false) {
     $constants = self::getConstants();
     if ($strict) {
       if (array_key_exists($name, $constants)) {

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -19,10 +19,10 @@ 
 {
 //<editor-fold desc="Fields">
   /** @var null|mixed[][] */
-  private static $constCacheArray = NULL;
+  private static $constCacheArray = null;
 
   /** @var null|string[][] */
-  private static $constCacheArrayCaseMapping = NULL;
+  private static $constCacheArrayCaseMapping = null;
 //</editor-fold desc="Fields">
 
 //<editor-fold desc="Public Methods">
@@ -121,7 +121,7 @@ 
    */
   private static function getCaseMapping(): array
   {
-    if (self::$constCacheArrayCaseMapping == NULL) {
+    if (self::$constCacheArrayCaseMapping == null) {
       self::$constCacheArrayCaseMapping = [];
     }
     $calledClass = get_called_class();
@@ -141,7 +141,7 @@ 
    */
   private static function getConstants(): array
   {
-    if (self::$constCacheArray == NULL) {
+    if (self::$constCacheArray == null) {
       self::$constCacheArray = [];
     }
     $calledClass = get_called_class();

src/Providers/FmLibServiceProvider.php

Indentation +30 added lines, -30 removed lines

@@ -44,7 +44,7 @@ 
    */
   public function boot()
   {
-    include __DIR__ . '/../routes.php';
+	include __DIR__ . '/../routes.php';
   }
 
   /** @noinspection PhpDocMissingThrowsInspection */ //\Doctrine\DBAL\DBALException
@@ -55,42 +55,42 @@ 
    */
   public function register()
   {
-    //register middleware
-    app()->routeMiddleware(['auth' => Authenticate::class]);
+	//register middleware
+	app()->routeMiddleware(['auth' => Authenticate::class]);
 
-    $this->app->singleton(
-      ExceptionHandler::class,
-      Handler::class
-    );
+	$this->app->singleton(
+	  ExceptionHandler::class,
+	  Handler::class
+	);
 
-    if ($this->app->environment() !== 'production') {
-      if (class_exists('\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider')) {
-        $this->app->register('\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider');
-      }
-    }
+	if ($this->app->environment() !== 'production') {
+	  if (class_exists('\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider')) {
+		$this->app->register('\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider');
+	  }
+	}
 
-    /** @noinspection PhpUnhandledExceptionInspection */ // \Doctrine\DBAL\DBALException datetime is a valid type
-    Type::overrideType('datetime', UTCDateTimeType::class);
+	/** @noinspection PhpUnhandledExceptionInspection */ // \Doctrine\DBAL\DBALException datetime is a valid type
+	Type::overrideType('datetime', UTCDateTimeType::class);
 
-    $this->app->register(LumenServiceProvider::class);
-    $this->app->register(DoctrineServiceProvider::class);
-    $this->app->register(GedmoExtensionsServiceProvider::class);
-    $this->app->register(JwtAuthGuardServiceProvider::class);
+	$this->app->register(LumenServiceProvider::class);
+	$this->app->register(DoctrineServiceProvider::class);
+	$this->app->register(GedmoExtensionsServiceProvider::class);
+	$this->app->register(JwtAuthGuardServiceProvider::class);
 
-    $this->app->singleton(DynamicServiceLoadingServiceInterface::class, function (Container $app) {
-      return new DynamicServiceLoadingService($app);
-    });
+	$this->app->singleton(DynamicServiceLoadingServiceInterface::class, function (Container $app) {
+	  return new DynamicServiceLoadingService($app);
+	});
 
-    $this->app->singleton(RankingSystemServiceInterface::class, function (Container $app) {
-      return new RankingSystemService($app->make(DynamicServiceLoadingServiceInterface::class),
-        $app->make(EntityManagerInterface::class));
-    });
+	$this->app->singleton(RankingSystemServiceInterface::class, function (Container $app) {
+	  return new RankingSystemService($app->make(DynamicServiceLoadingServiceInterface::class),
+		$app->make(EntityManagerInterface::class));
+	});
 
-    $this->app->singleton(EloRankingInterface::class, function (Container $app) {
-      $timeService = new RecursiveEndStartTimeService();
-      $entityComparer = new EntityComparerByTimeStartTimeAndLocalIdentifier($timeService);
-      return new EloRanking($app->make(EntityManagerInterface::class), $timeService, $entityComparer);
-    });
+	$this->app->singleton(EloRankingInterface::class, function (Container $app) {
+	  $timeService = new RecursiveEndStartTimeService();
+	  $entityComparer = new EntityComparerByTimeStartTimeAndLocalIdentifier($timeService);
+	  return new EloRanking($app->make(EntityManagerInterface::class), $timeService, $entityComparer);
+	});
   }
 //</editor-fold desc="Public Methods">
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * Created by PhpStorm.
  * User: benedikt
@@ -44,7 +44,7 @@ 
    */
   public function boot()
   {
-    include __DIR__ . '/../routes.php';
+    include __DIR__.'/../routes.php';
   }
 
   /** @noinspection PhpDocMissingThrowsInspection */ //\Doctrine\DBAL\DBALException
@@ -63,8 +63,8 @@ 
       Handler::class
     );
 
-    if ($this->app->environment() !== 'production') {
-      if (class_exists('\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider')) {
+    if ( $this->app->environment() !== 'production' ) {
+      if ( class_exists('\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider') ) {
         $this->app->register('\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider');
       }
     }
@@ -77,16 +77,16 @@ 
     $this->app->register(GedmoExtensionsServiceProvider::class);
     $this->app->register(JwtAuthGuardServiceProvider::class);
 
-    $this->app->singleton(DynamicServiceLoadingServiceInterface::class, function (Container $app) {
+    $this->app->singleton(DynamicServiceLoadingServiceInterface::class, function( Container $app ) {
       return new DynamicServiceLoadingService($app);
     });
 
-    $this->app->singleton(RankingSystemServiceInterface::class, function (Container $app) {
+    $this->app->singleton(RankingSystemServiceInterface::class, function( Container $app ) {
       return new RankingSystemService($app->make(DynamicServiceLoadingServiceInterface::class),
         $app->make(EntityManagerInterface::class));
     });
 
-    $this->app->singleton(EloRankingInterface::class, function (Container $app) {
+    $this->app->singleton(EloRankingInterface::class, function( Container $app ) {
       $timeService = new RecursiveEndStartTimeService();
       $entityComparer = new EntityComparerByTimeStartTimeAndLocalIdentifier($timeService);
       return new EloRanking($app->make(EntityManagerInterface::class), $timeService, $entityComparer);

Braces +3 added lines, -6 removed lines

@@ -34,16 +34,14 @@ 
  * Class FmLibServiceProvider
  * @package Tfboe\FmLib\Providers
  */
-class FmLibServiceProvider extends ServiceProvider
-{
+class FmLibServiceProvider extends ServiceProvider {
 //<editor-fold desc="Public Methods">
   /**
    * Bootstrap the application services.
    *
    * @return void
    */
-  public function boot()
-  {
+  public function boot() {
     include __DIR__ . '/../routes.php';
   }
 
@@ -53,8 +51,7 @@ 
    *
    * @return void
    */
-  public function register()
-  {
+  public function register() {
     //register middleware
     app()->routeMiddleware(['auth' => Authenticate::class]);
 

src/TestHelpers/LumenTestCase.php

Indentation +32 added lines, -32 removed lines

@@ -30,39 +30,39 @@
    */
   protected function checkProperties(array $data, $object, array $properties, array $enumProperties = [])
   {
-    foreach ($properties as $property => $default) {
-      $getter = 'get' . ucfirst($property);
-      if (!method_exists($object, $getter)) {
-        $getter = 'is' . ucfirst($property);
-      }
-      $transformer = null;
-      if (is_array($default) && array_key_exists('transformer', $default)) {
-        $transformer = $default['transformer'];
-        $default = $default['default'];
-      }
-      if (array_key_exists($property, $data)) {
-        $value = $data[$property];
-        if ($transformer != null) {
-          $value = $transformer($value);
-        }
-        self::assertEquals($value, $object->$getter());
-      } else {
-        self::assertEquals($default, $object->$getter());
-      }
-    }
+	foreach ($properties as $property => $default) {
+	  $getter = 'get' . ucfirst($property);
+	  if (!method_exists($object, $getter)) {
+		$getter = 'is' . ucfirst($property);
+	  }
+	  $transformer = null;
+	  if (is_array($default) && array_key_exists('transformer', $default)) {
+		$transformer = $default['transformer'];
+		$default = $default['default'];
+	  }
+	  if (array_key_exists($property, $data)) {
+		$value = $data[$property];
+		if ($transformer != null) {
+		  $value = $transformer($value);
+		}
+		self::assertEquals($value, $object->$getter());
+	  } else {
+		self::assertEquals($default, $object->$getter());
+	  }
+	}
 
-    foreach ($enumProperties as $property => $info) {
-      $enumClass = $info['enum'];
-      $default = $info['default'];
-      $getter = 'get' . ucfirst($property);
-      if (array_key_exists($property, $data)) {
-        $name = $data[$property];
-        /** @noinspection PhpUndefinedMethodInspection */
-        self::assertEquals($enumClass::getValue($name), $object->$getter());
-      } else {
-        self::assertEquals($default, $object->$getter());
-      }
-    }
+	foreach ($enumProperties as $property => $info) {
+	  $enumClass = $info['enum'];
+	  $default = $info['default'];
+	  $getter = 'get' . ucfirst($property);
+	  if (array_key_exists($property, $data)) {
+		$name = $data[$property];
+		/** @noinspection PhpUndefinedMethodInspection */
+		self::assertEquals($enumClass::getValue($name), $object->$getter());
+	  } else {
+		self::assertEquals($default, $object->$getter());
+	  }
+	}
   }
 //</editor-fold desc="Protected Methods">
 }

Spacing +12 added lines, -12 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Class TestCase
@@ -28,21 +28,21 @@ 
    * @param mixed[] $enumProperties the enum properties to check, property name maps to an info array, which contains
    *                                the enum name and the default value
    */
-  protected function checkProperties(array $data, $object, array $properties, array $enumProperties = [])
+  protected function checkProperties( array $data, $object, array $properties, array $enumProperties = [] )
   {
-    foreach ($properties as $property => $default) {
-      $getter = 'get' . ucfirst($property);
-      if (!method_exists($object, $getter)) {
-        $getter = 'is' . ucfirst($property);
+    foreach ( $properties as $property => $default ) {
+      $getter = 'get'.ucfirst($property);
+      if ( !method_exists($object, $getter) ) {
+        $getter = 'is'.ucfirst($property);
       }
       $transformer = null;
-      if (is_array($default) && array_key_exists('transformer', $default)) {
+      if ( is_array($default) && array_key_exists('transformer', $default) ) {
         $transformer = $default['transformer'];
         $default = $default['default'];
       }
-      if (array_key_exists($property, $data)) {
+      if ( array_key_exists($property, $data) ) {
         $value = $data[$property];
-        if ($transformer != null) {
+        if ( $transformer != null ) {
           $value = $transformer($value);
         }
         self::assertEquals($value, $object->$getter());
@@ -51,11 +51,11 @@ 
       }
     }
 
-    foreach ($enumProperties as $property => $info) {
+    foreach ( $enumProperties as $property => $info ) {
       $enumClass = $info['enum'];
       $default = $info['default'];
-      $getter = 'get' . ucfirst($property);
-      if (array_key_exists($property, $data)) {
+      $getter = 'get'.ucfirst($property);
+      if ( array_key_exists($property, $data) ) {
         $name = $data[$property];
         /** @noinspection PhpUndefinedMethodInspection */
         self::assertEquals($enumClass::getValue($name), $object->$getter());

Braces +2 added lines, -4 removed lines

@@ -13,8 +13,7 @@ 
  * Class TestCase
  * @package Tests\Helpers
  */
-abstract class LumenTestCase extends TestCase
-{
+abstract class LumenTestCase extends TestCase {
   use ReflectionMethods;
   use OnlyTestLogging;
 
@@ -28,8 +27,7 @@ 
    * @param mixed[] $enumProperties the enum properties to check, property name maps to an info array, which contains
    *                                the enum name and the default value
    */
-  protected function checkProperties(array $data, $object, array $properties, array $enumProperties = [])
-  {
+  protected function checkProperties(array $data, $object, array $properties, array $enumProperties = []) {
     foreach ($properties as $property => $default) {
       $getter = 'get' . ucfirst($property);
       if (!method_exists($object, $getter)) {

src/TestHelpers/AuthenticatedTestCase.php

Indentation +19 added lines, -19 removed lines

@@ -46,39 +46,39 @@
    */
   protected function jsonAuth(string $method, string $uri, array $data = [], array $headers = [])
   {
-    $headers['Authorization'] = 'Bearer ' . $this->token;
-    return $this->json($method, $uri, $data, $headers);
+	$headers['Authorization'] = 'Bearer ' . $this->token;
+	return $this->json($method, $uri, $data, $headers);
   }
 
   protected function workOnDatabaseDestroy()
   {
-    $this->clearUsers();
-    parent::workOnDatabaseDestroy();
+	$this->clearUsers();
+	parent::workOnDatabaseDestroy();
   }
 
   protected function workOnDatabaseSetUp()
   {
-    $this->clearUsers();
-    parent::workOnDatabaseSetUp();
-    $password = $this->newPassword();
-    $this->user = entity(User::class)->create(['originalPassword' => $password]);
-    /** @noinspection PhpUnhandledExceptionInspection */
-    $this->token = Auth::attempt(['email' => $this->user->getEmail(), 'password' => $password]);
-    $this->refreshApplication();
-    /** @noinspection PhpUndefinedMethodInspection */
-    $this->user = EntityManager::find(User::class, $this->user->getId());
+	$this->clearUsers();
+	parent::workOnDatabaseSetUp();
+	$password = $this->newPassword();
+	$this->user = entity(User::class)->create(['originalPassword' => $password]);
+	/** @noinspection PhpUnhandledExceptionInspection */
+	$this->token = Auth::attempt(['email' => $this->user->getEmail(), 'password' => $password]);
+	$this->refreshApplication();
+	/** @noinspection PhpUndefinedMethodInspection */
+	$this->user = EntityManager::find(User::class, $this->user->getId());
   }
 //</editor-fold desc="Protected Methods">
 
 //<editor-fold desc="Private Methods">
   private function clearUsers()
   {
-    /** @var Connection $connection */
-    /** @noinspection PhpUndefinedMethodInspection */
-    $connection = EntityManager::getConnection();
-    $sql = sprintf('SET FOREIGN_KEY_CHECKS=0;TRUNCATE TABLE %s;SET FOREIGN_KEY_CHECKS=1;', "users");
-    /** @noinspection PhpUnhandledExceptionInspection */
-    $connection->query($sql);
+	/** @var Connection $connection */
+	/** @noinspection PhpUndefinedMethodInspection */
+	$connection = EntityManager::getConnection();
+	$sql = sprintf('SET FOREIGN_KEY_CHECKS=0;TRUNCATE TABLE %s;SET FOREIGN_KEY_CHECKS=1;', "users");
+	/** @noinspection PhpUnhandledExceptionInspection */
+	$connection->query($sql);
   }
 //</editor-fold desc="Private Methods">
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Created by PhpStorm.
@@ -44,9 +44,9 @@ 
    * @param array $headers the request headers
    * @return $this
    */
-  protected function jsonAuth(string $method, string $uri, array $data = [], array $headers = [])
+  protected function jsonAuth( string $method, string $uri, array $data = [], array $headers = [] )
   {
-    $headers['Authorization'] = 'Bearer ' . $this->token;
+    $headers['Authorization'] = 'Bearer '.$this->token;
     return $this->json($method, $uri, $data, $headers);
   }
 

Braces +5 added lines, -10 removed lines

@@ -19,8 +19,7 @@ 
  * Class AuthenticatedTestCase
  * @package Tests\Helpers
  */
-abstract class AuthenticatedTestCase extends DatabaseTestCase
-{
+abstract class AuthenticatedTestCase extends DatabaseTestCase {
 //<editor-fold desc="Fields">
   /**
    * Authentication token if logged in
@@ -44,20 +43,17 @@ 
    * @param array $headers the request headers
    * @return $this
    */
-  protected function jsonAuth(string $method, string $uri, array $data = [], array $headers = [])
-  {
+  protected function jsonAuth(string $method, string $uri, array $data = [], array $headers = []) {
     $headers['Authorization'] = 'Bearer ' . $this->token;
     return $this->json($method, $uri, $data, $headers);
   }
 
-  protected function workOnDatabaseDestroy()
-  {
+  protected function workOnDatabaseDestroy() {
     $this->clearUsers();
     parent::workOnDatabaseDestroy();
   }
 
-  protected function workOnDatabaseSetUp()
-  {
+  protected function workOnDatabaseSetUp() {
     $this->clearUsers();
     parent::workOnDatabaseSetUp();
     $password = $this->newPassword();
@@ -71,8 +67,7 @@ 
 //</editor-fold desc="Protected Methods">
 
 //<editor-fold desc="Private Methods">
-  private function clearUsers()
-  {
+  private function clearUsers() {
     /** @var Connection $connection */
     /** @noinspection PhpUndefinedMethodInspection */
     $connection = EntityManager::getConnection();

src/TestHelpers/DatabaseTestCase.php

Indentation +59 added lines, -59 removed lines

@@ -41,10 +41,10 @@ 
    */
   public function __construct($name = null, array $data = [], $dataName = '', $clear = false)
   {
-    parent::__construct($name, $data, $dataName);
-    srand(3); //always use the same faker values to get reproducibility
-    $this->faker = Factory::create();
-    $this->clear = $clear;
+	parent::__construct($name, $data, $dataName);
+	srand(3); //always use the same faker values to get reproducibility
+	$this->faker = Factory::create();
+	$this->clear = $clear;
   }
 //</editor-fold desc="Constructor">
 
@@ -56,16 +56,16 @@ 
    */
   protected function clearDatabase()
   {
-    /** @var \Doctrine\DBAL\Connection $connection */
-    /** @noinspection PhpUndefinedMethodInspection */
-    $connection = EntityManager::getConnection();
-    $connection->query(sprintf('SET FOREIGN_KEY_CHECKS = 0;'));
-    $tables = $connection->getSchemaManager()->listTables();
-    foreach ($tables as $table) {
-      $sql = sprintf('TRUNCATE TABLE %s', $table->getName());
-      $connection->query($sql);
-    }
-    $connection->query(sprintf('SET FOREIGN_KEY_CHECKS = 1;'));
+	/** @var \Doctrine\DBAL\Connection $connection */
+	/** @noinspection PhpUndefinedMethodInspection */
+	$connection = EntityManager::getConnection();
+	$connection->query(sprintf('SET FOREIGN_KEY_CHECKS = 0;'));
+	$tables = $connection->getSchemaManager()->listTables();
+	foreach ($tables as $table) {
+	  $sql = sprintf('TRUNCATE TABLE %s', $table->getName());
+	  $connection->query($sql);
+	}
+	$connection->query(sprintf('SET FOREIGN_KEY_CHECKS = 1;'));
   }
 
   /**
@@ -75,11 +75,11 @@ 
    */
   protected function createPlayers(int $number = 1): array
   {
-    $result = [];
-    for ($i = 0; $i < $number; $i++) {
-      $result[] = entity(Player::class)->create();
-    }
-    return $result;
+	$result = [];
+	for ($i = 0; $i < $number; $i++) {
+	  $result[] = entity(Player::class)->create();
+	}
+	return $result;
   }
 
   /**
@@ -90,16 +90,16 @@ 
    */
   protected function createTeams(int $number, $playerPerTeam = 1): array
   {
-    $result = [];
-    for ($i = 0; $i < $number; $i++) {
-      /** @var Team $team */
-      $team = entity(Team::class)->create(['startNumber' => $i + 1, 'rank' => $number - $i]);
-      foreach ($this->createPlayers($playerPerTeam) as $player) {
-        $team->getPlayers()->add($player);
-      }
-      $result[] = $team;
-    }
-    return $result;
+	$result = [];
+	for ($i = 0; $i < $number; $i++) {
+	  /** @var Team $team */
+	  $team = entity(Team::class)->create(['startNumber' => $i + 1, 'rank' => $number - $i]);
+	  foreach ($this->createPlayers($playerPerTeam) as $player) {
+		$team->getPlayers()->add($player);
+	  }
+	  $result[] = $team;
+	}
+	return $result;
   }
 
   /**
@@ -108,13 +108,13 @@ 
    */
   protected function createUser()
   {
-    $password = $this->newPassword();
-    /** @var User $user */
-    $user = entity(User::class)->create(['originalPassword' => $password]);
-    return [
-      'password' => $password,
-      'user' => $user
-    ];
+	$password = $this->newPassword();
+	/** @var User $user */
+	$user = entity(User::class)->create(['originalPassword' => $password]);
+	return [
+	  'password' => $password,
+	  'user' => $user
+	];
   }
 
   /**
@@ -123,7 +123,7 @@ 
    */
   protected function newPassword()
   {
-    return $this->faker->password(8, 30);
+	return $this->faker->password(8, 30);
   }
 
   /**
@@ -134,28 +134,28 @@ 
    */
   protected function setUpTraits()
   {
-    srand(3); //always use the same faker values to get reproducibility
-    $clear = $this->clear;
-    parent::setUpTraits();
-    if ($clear) {
-      $this->clearDatabase();
-      $this->workOnDatabaseSetUp();
-    } else {
-      $this->workOnDatabaseSetUp();
-      /** @noinspection PhpUndefinedMethodInspection */
-      EntityManager::beginTransaction();
-    }
-
-    $this->beforeApplicationDestroyed(function () use ($clear) {
-      if ($clear) {
-        $this->workOnDatabaseDestroy();
-        $this->clearDatabase();
-      } else {
-        /** @noinspection PhpUndefinedMethodInspection */
-        EntityManager::rollback();
-        $this->workOnDatabaseDestroy();
-      }
-    });
+	srand(3); //always use the same faker values to get reproducibility
+	$clear = $this->clear;
+	parent::setUpTraits();
+	if ($clear) {
+	  $this->clearDatabase();
+	  $this->workOnDatabaseSetUp();
+	} else {
+	  $this->workOnDatabaseSetUp();
+	  /** @noinspection PhpUndefinedMethodInspection */
+	  EntityManager::beginTransaction();
+	}
+
+	$this->beforeApplicationDestroyed(function () use ($clear) {
+	  if ($clear) {
+		$this->workOnDatabaseDestroy();
+		$this->clearDatabase();
+	  } else {
+		/** @noinspection PhpUndefinedMethodInspection */
+		EntityManager::rollback();
+		$this->workOnDatabaseDestroy();
+	  }
+	});
   }
 
   protected function workOnDatabaseDestroy()

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 
 /**
  * Class DatabaseTestCase
@@ -39,7 +39,7 @@ 
    * @param string $dataName test data name
    * @param bool $clear
    */
-  public function __construct($name = null, array $data = [], $dataName = '', $clear = false)
+  public function __construct( $name = null, array $data = [], $dataName = '', $clear = false )
   {
     parent::__construct($name, $data, $dataName);
     srand(3); //always use the same faker values to get reproducibility
@@ -61,7 +61,7 @@ 
     $connection = EntityManager::getConnection();
     $connection->query(sprintf('SET FOREIGN_KEY_CHECKS = 0;'));
     $tables = $connection->getSchemaManager()->listTables();
-    foreach ($tables as $table) {
+    foreach ( $tables as $table ) {
       $sql = sprintf('TRUNCATE TABLE %s', $table->getName());
       $connection->query($sql);
     }
@@ -73,10 +73,10 @@ 
    * @param int $number the number of players
    * @return Player[] the created player array
    */
-  protected function createPlayers(int $number = 1): array
+  protected function createPlayers( int $number = 1 ): array
   {
     $result = [];
-    for ($i = 0; $i < $number; $i++) {
+    for ( $i = 0; $i < $number; $i++ ) {
       $result[] = entity(Player::class)->create();
     }
     return $result;
@@ -88,13 +88,13 @@ 
    * @param int $playerPerTeam the number of players per team
    * @return Team[] the created team array
    */
-  protected function createTeams(int $number, $playerPerTeam = 1): array
+  protected function createTeams( int $number, $playerPerTeam = 1 ): array
   {
     $result = [];
-    for ($i = 0; $i < $number; $i++) {
+    for ( $i = 0; $i < $number; $i++ ) {
       /** @var Team $team */
       $team = entity(Team::class)->create(['startNumber' => $i + 1, 'rank' => $number - $i]);
-      foreach ($this->createPlayers($playerPerTeam) as $player) {
+      foreach ( $this->createPlayers($playerPerTeam) as $player ) {
         $team->getPlayers()->add($player);
       }
       $result[] = $team;
@@ -137,7 +137,7 @@ 
     srand(3); //always use the same faker values to get reproducibility
     $clear = $this->clear;
     parent::setUpTraits();
-    if ($clear) {
+    if ( $clear ) {
       $this->clearDatabase();
       $this->workOnDatabaseSetUp();
     } else {
@@ -146,8 +146,8 @@ 
       EntityManager::beginTransaction();
     }
 
-    $this->beforeApplicationDestroyed(function () use ($clear) {
-      if ($clear) {
+    $this->beforeApplicationDestroyed(function() use ($clear) {
+      if ( $clear ) {
         $this->workOnDatabaseDestroy();
         $this->clearDatabase();
       } else {

Braces +8 added lines, -16 removed lines

@@ -17,8 +17,7 @@ 
  * Class DatabaseTestCase
  * @package Tests\Helpers
  */
-abstract class DatabaseTestCase extends LumenTestCase
-{
+abstract class DatabaseTestCase extends LumenTestCase {
 //<editor-fold desc="Fields">
   /**
    * @var \Faker\Generator
@@ -39,8 +38,7 @@ 
    * @param string $dataName test data name
    * @param bool $clear
    */
-  public function __construct($name = null, array $data = [], $dataName = '', $clear = false)
-  {
+  public function __construct($name = null, array $data = [], $dataName = '', $clear = false) {
     parent::__construct($name, $data, $dataName);
     srand(3); //always use the same faker values to get reproducibility
     $this->faker = Factory::create();
@@ -54,8 +52,7 @@ 
    * Clears the database by truncating all tables (very time consuming)
    * @throws \Doctrine\DBAL\DBALException
    */
-  protected function clearDatabase()
-  {
+  protected function clearDatabase() {
     /** @var \Doctrine\DBAL\Connection $connection */
     /** @noinspection PhpUndefinedMethodInspection */
     $connection = EntityManager::getConnection();
@@ -106,8 +103,7 @@ 
    * Creates a new user
    * @return array containing the password and the user object
    */
-  protected function createUser()
-  {
+  protected function createUser() {
     $password = $this->newPassword();
     /** @var User $user */
     $user = entity(User::class)->create(['originalPassword' => $password]);
@@ -121,8 +117,7 @@ 
    * Uses faker to generate a new password
    * @return string the new password
    */
-  protected function newPassword()
-  {
+  protected function newPassword() {
     return $this->faker->password(8, 30);
   }
 
@@ -132,8 +127,7 @@ 
    * @return void
    * @throws \Doctrine\DBAL\DBALException
    */
-  protected function setUpTraits()
-  {
+  protected function setUpTraits() {
     srand(3); //always use the same faker values to get reproducibility
     $clear = $this->clear;
     parent::setUpTraits();
@@ -158,13 +152,11 @@ 
     });
   }
 
-  protected function workOnDatabaseDestroy()
-  {
+  protected function workOnDatabaseDestroy() {
 
   }
 
-  protected function workOnDatabaseSetUp()
-  {
+  protected function workOnDatabaseSetUp() {
 
   }
 //</editor-fold desc="Protected Methods">

src/TestHelpers/ReflectionMethods.php

Indentation +14 added lines, -14 removed lines

@@ -26,9 +26,9 @@ 
    */
   protected static function callProtectedMethod($object, string $method, array $args = [])
   {
-    // ReflectionException => get_class is a valid class
-    /** @noinspection PhpUnhandledExceptionInspection */
-    return self::getMethod(get_class($object), $method)->invokeArgs($object, $args);
+	// ReflectionException => get_class is a valid class
+	/** @noinspection PhpUnhandledExceptionInspection */
+	return self::getMethod(get_class($object), $method)->invokeArgs($object, $args);
   }
 
   /**
@@ -40,10 +40,10 @@ 
    */
   protected static function getMethod(string $class, string $name): \ReflectionMethod
   {
-    $class = new \ReflectionClass($class);
-    $method = $class->getMethod($name);
-    $method->setAccessible(true);
-    return $method;
+	$class = new \ReflectionClass($class);
+	$method = $class->getMethod($name);
+	$method->setAccessible(true);
+	return $method;
   }
 
   /**
@@ -55,13 +55,13 @@ 
    */
   protected static function getProperty(string $class, string $name): \ReflectionProperty
   {
-    $class = new \ReflectionClass($class);
-    /** @noinspection PhpStatementHasEmptyBodyInspection */
-    while (!$class->hasProperty($name) && ($class = $class->getParentClass()) !== null) {
-    }
-    $property = $class->getProperty($name);
-    $property->setAccessible(true);
-    return $property;
+	$class = new \ReflectionClass($class);
+	/** @noinspection PhpStatementHasEmptyBodyInspection */
+	while (!$class->hasProperty($name) && ($class = $class->getParentClass()) !== null) {
+	}
+	$property = $class->getProperty($name);
+	$property->setAccessible(true);
+	return $property;
   }
 //</editor-fold desc="Protected Methods">
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * Created by PhpStorm.
  * User: benedikt
@@ -24,7 +24,7 @@ 
    * @param mixed[] $args the arguments for the method
    * @return mixed the return value of the method
    */
-  protected static function callProtectedMethod($object, string $method, array $args = [])
+  protected static function callProtectedMethod( $object, string $method, array $args = [] )
   {
     // ReflectionException => get_class is a valid class
     /** @noinspection PhpUnhandledExceptionInspection */
@@ -38,7 +38,7 @@ 
    * @return \ReflectionMethod the accessible method object
    * @throws \ReflectionException the given class does not exist
    */
-  protected static function getMethod(string $class, string $name): \ReflectionMethod
+  protected static function getMethod( string $class, string $name ): \ReflectionMethod
   {
     $class = new \ReflectionClass($class);
     $method = $class->getMethod($name);
@@ -53,11 +53,11 @@ 
    * @return \ReflectionProperty the accessible property object
    * @throws \ReflectionException the given class does not exist
    */
-  protected static function getProperty(string $class, string $name): \ReflectionProperty
+  protected static function getProperty( string $class, string $name ): \ReflectionProperty
   {
     $class = new \ReflectionClass($class);
     /** @noinspection PhpStatementHasEmptyBodyInspection */
-    while (!$class->hasProperty($name) && ($class = $class->getParentClass()) !== null) {
+    while ( !$class->hasProperty($name) && ($class = $class->getParentClass()) !== null ) {
     }
     $property = $class->getProperty($name);
     $property->setAccessible(true);

Braces +2 added lines, -4 removed lines

@@ -13,8 +13,7 @@ 
  * Trait ReflectionMethods
  * @package Tests\Helpers
  */
-trait ReflectionMethods
-{
+trait ReflectionMethods {
 //<editor-fold desc="Protected Methods">
   /** @noinspection PhpDocMissingThrowsInspection */ //ReflectionException
   /**
@@ -24,8 +23,7 @@ 
    * @param mixed[] $args the arguments for the method
    * @return mixed the return value of the method
    */
-  protected static function callProtectedMethod($object, string $method, array $args = [])
-  {
+  protected static function callProtectedMethod($object, string $method, array $args = []) {
     // ReflectionException => get_class is a valid class
     /** @noinspection PhpUnhandledExceptionInspection */
     return self::getMethod(get_class($object), $method)->invokeArgs($object, $args);