jon48 / webtrees-lib

src/Webtrees/Functions/Functions.php

Spacing +22 added lines, -22 removed lines

@@ -32,9 +32,9 @@ 
 	 *
 	 * @param string $text Text to display
 	 */
-	static public function promptAlert($text){
+	static public function promptAlert($text) {
 		echo '<script>';
-		echo 'alert("',fw\Filter::escapeHtml($text),'")';
+		echo 'alert("', fw\Filter::escapeHtml($text), '")';
 		echo '</script>';
 	}
 	
@@ -47,7 +47,7 @@ 
 	 * @return float Result of the safe division
 	 */
 	public static function safeDivision($num, $denom, $default = 0) {
-		if($denom && $denom!=0){
+		if ($denom && $denom != 0) {
 			return $num / $denom;
 		}
 		return $default;
@@ -61,7 +61,7 @@ 
 	 * @param float $default Default value if denominator null or 0
 	 * @return float Percentage
 	 */
-	public static function getPercentage($num, $denom, $default = 0){
+	public static function getPercentage($num, $denom, $default = 0) {
 		return 100 * self::safeDivision($num, $denom, $default);
 	}
 	
@@ -72,8 +72,8 @@ 
 	 * @param int $target	The final max width/height
 	 * @return array array of ($width, $height). One of them must be $target
 	 */
-	static public function getResizedImageSize($file, $target=25){
-		list($width, $height, , ) = getimagesize($file);
+	static public function getResizedImageSize($file, $target = 25) {
+		list($width, $height,,) = getimagesize($file);
 		$max = max($width, $height);
 		$rapp = $target / $max;
 		$width = intval($rapp * $width);
@@ -103,21 +103,21 @@ 
 	 * @param int $length Length of the token, default to 32
 	 * @return string Random token
 	 */
-	public static function generateRandomToken($length=32) {
+	public static function generateRandomToken($length = 32) {
 		$chars = str_split('abcdefghijkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789');
 		$len_chars = count($chars);
 		$token = '';
 		
 		for ($i = 0; $i < $length; $i++)
-			$token .= $chars[ mt_rand(0, $len_chars - 1) ];
+			$token .= $chars[mt_rand(0, $len_chars - 1)];
 		
 		# Number of 32 char chunks
-		$chunks = ceil( strlen($token) / 32 );
+		$chunks = ceil(strlen($token) / 32);
 		$md5token = '';
 		
 		# Run each chunk through md5
-		for ( $i=1; $i<=$chunks; $i++ )
-			$md5token .= md5( substr($token, $i * 32 - 32, 32) );
+		for ($i = 1; $i <= $chunks; $i++)
+			$md5token .= md5(substr($token, $i * 32 - 32, 32));
 		
 			# Trim the token
 		return substr($md5token, 0, $length);		
@@ -130,7 +130,7 @@ 
 	 */
 	protected static function getBase64EncryptionKey() {	    
 	    $key = 'STANDARDKEYIFNOSERVER';
-	    if(!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
+	    if (!empty(Filter::server('SERVER_NAME')) && !empty(Filter::server('SERVER_SOFTWARE')))
 	        $key = md5(Filter::server('SERVER_NAME').Filter::server('SERVER_SOFTWARE'));
 	    
 	    return $key;
@@ -143,7 +143,7 @@ 
 	 * @param string $data Text to encrypt
 	 * @return string Encrypted and encoded text
 	 */
-	public static function encryptToSafeBase64($data){		
+	public static function encryptToSafeBase64($data) {		
 		$nonce = random_bytes(SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);	
 		$id = sodium_crypto_secretbox($data, $nonce, self::getBase64EncryptionKey());
 		$encrypted = base64_encode($nonce.$id);
@@ -163,12 +163,12 @@ 
 	 * @param string $encrypted Text to decrypt
 	 * @return string Decrypted text
 	 */
-	public static function decryptFromSafeBase64($encrypted){
+	public static function decryptFromSafeBase64($encrypted) {
 		$encrypted = str_replace('-', '+', $encrypted);
 		$encrypted = str_replace('_', '/', $encrypted);
 		$encrypted = str_replace('*', '=', $encrypted);
 		$encrypted = base64_decode($encrypted);
-		if($encrypted === false)
+		if ($encrypted === false)
 			throw new \InvalidArgumentException('The encrypted value is not in correct base64 format.');
 		
 		if (mb_strlen($encrypted, '8bit') < (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES))
@@ -179,7 +179,7 @@ 
         
         $decrypted = sodium_crypto_secretbox_open($ciphertext, $nonce, self::getBase64EncryptionKey());
 		
-        if($decrypted === false) {
+        if ($decrypted === false) {
             throw new \InvalidArgumentException('The message has been tampered with in transit.');
         }
         
@@ -194,9 +194,9 @@ 
 	 * @param string $string Filesystem encoded string to encode
 	 * @return string UTF-8 encoded string
 	 */
-	public static function encodeFileSystemToUtf8($string){
+	public static function encodeFileSystemToUtf8($string) {
 		if (strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-		    return iconv('cp1252', 'utf-8//IGNORE',$string);
+		    return iconv('cp1252', 'utf-8//IGNORE', $string);
 		}
 		return $string;
 	}
@@ -207,9 +207,9 @@ 
 	 * @param string $string UTF-8 encoded string to encode
 	 * @return string Filesystem encoded string
 	 */
-	public static function encodeUtf8ToFileSystem($string){
+	public static function encodeUtf8ToFileSystem($string) {
 		if (preg_match('//u', $string) && strtoupper(substr(php_uname('s'), 0, 7)) === 'WINDOWS') {
-			return iconv('utf-8', 'cp1252//IGNORE' ,  $string);
+			return iconv('utf-8', 'cp1252//IGNORE', $string);
 		}
 		return $string;
 	}
@@ -222,7 +222,7 @@ 
 	 * @return boolean True if path valid
 	 */
 	public static function isValidPath($filename, $acceptfolder = FALSE) {		
-		if(strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true;
+		if (strpbrk($filename, $acceptfolder ? '?%*:|"<>' : '\\/?%*:|"<>') === FALSE) return true;
 		return false;
 	}
 	
@@ -234,7 +234,7 @@ 
 	 * @return array Array of month short names
 	 */
 	public static function getCalendarShortMonths($calendarId = 0) {
-		if(!isset(self::$calendarShortMonths[$calendarId])) {
+		if (!isset(self::$calendarShortMonths[$calendarId])) {
 			$calendar_info = cal_info($calendarId);
 			self::$calendarShortMonths[$calendarId] = $calendar_info['abbrevmonths'];
 		}		

src/Webtrees/Module/PatronymicLineage/Http/RequestHandlers/LineagesPage.php

Spacing +3 added lines, -3 removed lines

@@ -75,16 +75,16 @@
 
         $initial = mb_substr($surname, 0, 1);
         $initials_list = collect($this->indilist_module->surnameAlpha($tree, false, false, I18N::locale()))
-            ->reject(function ($count, $initial): bool {
+            ->reject(function($count, $initial): bool {
 
                 return $initial === '@' || $initial === ',';
             });
 
-        $title = I18N::translate('Patronymic Lineages') . ' — ' . $surname;
+        $title = I18N::translate('Patronymic Lineages').' — '.$surname;
 
         $lineages = app()->make(LineageBuilder::class, ['surname' => $surname])->buildLineages();
 
-        return $this->viewResponse($this->module->name() . '::lineages-page', [
+        return $this->viewResponse($this->module->name().'::lineages-page', [
             'title'         =>  $title,
             'module'        =>  $this->module,
             'tree'          =>  $tree,

src/Webtrees/Module/PatronymicLineage/Http/RequestHandlers/SurnamesList.php

Spacing +5 added lines, -5 removed lines

@@ -72,7 +72,7 @@ 
 
         $initial = $request->getAttribute('alpha');
         $initials_list = collect($this->indilist_module->surnameAlpha($tree, false, false, I18N::locale()))
-            ->reject(function ($count, $initial): bool {
+            ->reject(function($count, $initial): bool {
 
                 return $initial === '@' || $initial === ',';
             });
@@ -80,17 +80,17 @@ 
         $show_all = $request->getQueryParams()['show_all'] ?? 'no';
 
         if ($show_all === 'yes') {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . I18N::translate('All');
+            $title = I18N::translate('Patronymic Lineages').' — '.I18N::translate('All');
             $surnames = $this->indilist_module->surnames($tree, '', '', false, false, I18N::locale());
         } elseif ($initial !== null && mb_strlen($initial) == 1) {
-            $title = I18N::translate('Patronymic Lineages') . ' — ' . $initial;
+            $title = I18N::translate('Patronymic Lineages').' — '.$initial;
             $surnames = $this->indilist_module->surnames($tree, '', $initial, false, false, I18N::locale());
         } else {
-            $title =  I18N::translate('Patronymic Lineages');
+            $title = I18N::translate('Patronymic Lineages');
             $surnames = [];
         }
 
-        return $this->viewResponse($this->module->name() . '::surnames-page', [
+        return $this->viewResponse($this->module->name().'::surnames-page', [
             'title'         =>  $title,
             'module'        =>  $this->module,
             'tree'          =>  $tree,

src/Webtrees/Module/PatronymicLineage/PatronymicLineageModule.php

Spacing +4 added lines, -4 removed lines

@@ -61,11 +61,11 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/lineages', static function (Map $router): void {
+            $router->attach('', '/module-maj/lineages', static function(Map $router): void {
 
-                $router->attach('', '/Page', static function (Map $router): void {
+                $router->attach('', '/Page', static function(Map $router): void {
 
                     $router->get(SurnamesList::class, '/{tree}/list{/alpha}', SurnamesList::class);
                     $router->get(LineagesPage::class, '/{tree}/lineage/{surname}', LineagesPage::class);
@@ -122,6 +122,6 @@ 
      */
     public function headContent(): string
     {
-        return '<link rel="stylesheet" href="' . e($this->moduleCssUrl()) . '">';
+        return '<link rel="stylesheet" href="'.e($this->moduleCssUrl()).'">';
     }
 }

src/Webtrees/Module/WelcomeBlock/Http/RequestHandlers/MatomoStats.php

Spacing +3 added lines, -3 removed lines

@@ -64,11 +64,11 @@
         $nb_visits_year = $nb_visits_today = null;
 
         if ($block_id !== false && $this->module->isMatomoEnabled($block_id)) {
-            $nb_visits_today = (int) $this->matomo_service->visitsToday($this->module, $block_id);
-            $nb_visits_year = (int) $this->matomo_service->visitsThisYear($this->module, $block_id) + $nb_visits_today;
+            $nb_visits_today = (int)$this->matomo_service->visitsToday($this->module, $block_id);
+            $nb_visits_year = (int)$this->matomo_service->visitsThisYear($this->module, $block_id) + $nb_visits_today;
         }
 
-        return $this->viewResponse($this->module->name() . '::matomo-stats', [
+        return $this->viewResponse($this->module->name().'::matomo-stats', [
             'visits_year'   =>  $nb_visits_year,
             'visits_today'  =>  $nb_visits_today
         ]);

src/Webtrees/Module/WelcomeBlock/WelcomeBlockModule.php

Spacing +7 added lines, -7 removed lines

@@ -57,9 +57,9 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/welcomeblock/{block_id}', static function (Map $router): void {
+            $router->attach('', '/module-maj/welcomeblock/{block_id}', static function(Map $router): void {
 
                 $router->get(MatomoStats::class, '/matomostats', MatomoStats::class);
             });
@@ -87,7 +87,7 @@ 
         $fab_login_block_view = app(\Fisharebest\Webtrees\Module\LoginBlockModule::class)
             ->getBlock($tree, $block_id, ModuleBlockInterface::CONTEXT_EMBED);
 
-        $content = view($this->name() . '::block-embed', [
+        $content = view($this->name().'::block-embed', [
             'block_id'                  =>  $block_id,
             'fab_welcome_block_view'    =>  $fab_welcome_block_view,
             'fab_login_block_view'      =>  $fab_login_block_view,
@@ -122,7 +122,7 @@ 
      */
     public function editBlockConfiguration(Tree $tree, int $block_id): string
     {
-        return view($this->name() . '::config', $this->matomoSettings($block_id));
+        return view($this->name().'::config', $this->matomoSettings($block_id));
     }
 
     /**
@@ -131,7 +131,7 @@ 
      */
     public function saveBlockConfiguration(ServerRequestInterface $request, int $block_id): void
     {
-        $params = (array) $request->getParsedBody();
+        $params = (array)$request->getParsedBody();
 
         $matomo_enabled = $params['matomo_enabled'] == 'yes';
         $this->setBlockSetting($block_id, 'matomo_enabled', $matomo_enabled ? 'yes' : 'no');
@@ -154,7 +154,7 @@ 
             ->setBlockSetting($block_id, 'matomo_token', trim($params['matomo_token']))
             ->setBlockSetting($block_id, 'matomo_siteid', $params['matomo_siteid']);
 
-        app('cache.files')->forget($this->name() . '-matomovisits-yearly-' . $block_id);
+        app('cache.files')->forget($this->name().'-matomovisits-yearly-'.$block_id);
     }
 
     /**
@@ -180,7 +180,7 @@ 
             'matomo_enabled' => $this->isMatomoEnabled($block_id),
             'matomo_url' => $this->getBlockSetting($block_id, 'matomo_url'),
             'matomo_token' => $this->getBlockSetting($block_id, 'matomo_token'),
-            'matomo_siteid'  => (int) $this->getBlockSetting($block_id, 'matomo_siteid', '0')
+            'matomo_siteid'  => (int)$this->getBlockSetting($block_id, 'matomo_siteid', '0')
         ];
     }
 }

src/Webtrees/Module/WelcomeBlock/Services/MatomoStatsService.php

Spacing +6 added lines, -6 removed lines

@@ -43,13 +43,13 @@ 
         $cache = Registry::cache()->file();
 
         return $cache->remember(
-            $module->name() . '-matomovisits-yearly-' . $block_id,
-            function () use ($module, $block_id): ?int {
+            $module->name().'-matomovisits-yearly-'.$block_id,
+            function() use ($module, $block_id): ?int {
                 $visits_year = $this->visits($module, $block_id, 'year');
                 if ($visits_year === null) {
                     return null;
                 }
-                $visits_today = (int) $this->visits($module, $block_id, 'day');
+                $visits_today = (int)$this->visits($module, $block_id, 'day');
 
                 return $visits_year - $visits_today;
             },
@@ -67,8 +67,8 @@ 
     public function visitsToday(WelcomeBlockModule $module, int $block_id): ?int
     {
         return app('cache.array')->remember(
-            $module->name() . '-matomovisits-daily-' . $block_id,
-            function () use ($module, $block_id): ?int {
+            $module->name().'-matomovisits-daily-'.$block_id,
+            function() use ($module, $block_id) : ?int {
                 return $this->visits($module, $block_id, 'day');
             }
         );
@@ -110,7 +110,7 @@ 
                 ]);
 
                 if ($response->getStatusCode() === StatusCodeInterface::STATUS_OK) {
-                    $result = json_decode((string) $response->getBody(), true)['value'] ?? null;
+                    $result = json_decode((string)$response->getBody(), true)['value'] ?? null;
                     if ($result !== null) {
                         return (int)$result;
                     }

src/Webtrees/Module/AdminTasks/AdminTasksModule.php

Spacing +6 added lines, -6 removed lines

@@ -51,7 +51,7 @@ 
     //How to update the database schema for this module
     private const SCHEMA_TARGET_VERSION   = 2;
     private const SCHEMA_SETTING_NAME     = 'MAJ_ADMTASKS_SCHEMA_VERSION';
-    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__ . '\Schema';
+    private const SCHEMA_MIGRATION_PREFIX = __NAMESPACE__.'\Schema';
 
     /**
      * {@inheritDoc}
@@ -91,11 +91,11 @@ 
      */
     public function loadRoutes(Map $router): void
     {
-        $router->attach('', '', static function (Map $router): void {
+        $router->attach('', '', static function(Map $router): void {
 
-            $router->attach('', '/module-maj/admintasks', static function (Map $router): void {
+            $router->attach('', '/module-maj/admintasks', static function(Map $router): void {
 
-                $router->attach('', '/admin', static function (Map $router): void {
+                $router->attach('', '/admin', static function(Map $router): void {
 
                     $router->extras([
                         'middleware' => [
@@ -104,7 +104,7 @@ 
                     ]);
                     $router->get(AdminConfigPage::class, '/config', AdminConfigPage::class);
 
-                    $router->attach('', '/tasks', static function (Map $router): void {
+                    $router->attach('', '/tasks', static function(Map $router): void {
 
                         $router->get(TasksList::class, '', TasksList::class);
                         $router->get(TaskEditPage::class, '/{task}', TaskEditPage::class);
@@ -146,7 +146,7 @@ 
      */
     public function bodyContent(): string
     {
-        return view($this->name() . '::snippet', [ 'url' => route(TaskTrigger::class) ]);
+        return view($this->name().'::snippet', ['url' => route(TaskTrigger::class)]);
     }
 
     /**

src/Webtrees/Module/AdminTasks/Http/RequestHandlers/TasksList.php

Spacing +10 added lines, -11 removed lines

@@ -74,7 +74,7 @@ 
         }
 
         $task_schedules = $this->taskschedules_service->all(true, true)
-            ->map(function (TaskSchedule $value): array {
+            ->map(function(TaskSchedule $value): array {
 
                 $row = $value->toArray();
                 $task = $this->taskschedules_service->findTask($row['task_id']);
@@ -86,7 +86,7 @@ 
         $sort_columns   = ['task_name', 'enabled', 'last_run'];
         $module_name = $this->module->name();
 
-        $callback = function (array $row) use ($module_name): array {
+        $callback = function(array $row) use ($module_name): array {
 
             $row['frequency']->setLocale(I18N::locale()->code());
 
@@ -109,21 +109,20 @@ 
             ];
 
             $datum = [
-                view($module_name . '::admin/tasks-table-options', $task_options_params),
-                view($module_name . '::components/yes-no-icons', ['yes' => $row['enabled']]),
-                '<span dir="auto">' . e($row['task_name']) . '</span>',
+                view($module_name.'::admin/tasks-table-options', $task_options_params),
+                view($module_name.'::components/yes-no-icons', ['yes' => $row['enabled']]),
+                '<span dir="auto">'.e($row['task_name']).'</span>',
                 $row['last_run']->unix() === 0 ?
-                view('components/datetime', ['timestamp' => $row['last_run']]) :
-                view('components/datetime-diff', ['timestamp' => $row['last_run']]),
-                view($module_name . '::components/yes-no-icons', ['yes' => $row['last_result']]),
-                '<span dir="auto">' . e($row['frequency']->cascade()->forHumans()) . '</span>',
+                view('components/datetime', ['timestamp' => $row['last_run']]) : view('components/datetime-diff', ['timestamp' => $row['last_run']]),
+                view($module_name.'::components/yes-no-icons', ['yes' => $row['last_result']]),
+                '<span dir="auto">'.e($row['frequency']->cascade()->forHumans()).'</span>',
                 $row['nb_occurrences'] > 0 ? I18N::number($row['nb_occurrences']) : I18N::translate('Unlimited'),
-                view($module_name . '::components/yes-no-icons', [
+                view($module_name.'::components/yes-no-icons', [
                     'yes' => $row['is_running'],
                     'text_yes' => I18N::translate('Running'),
                     'text_no' => I18N::translate('Not running')
                 ]),
-                view($module_name . '::admin/tasks-table-run', $task_run_params)
+                view($module_name.'::admin/tasks-table-run', $task_run_params)
             ];
 
             return $datum;