v4.6.0-RC3 (#1486)

* sync Front-end * and update composer while we are at it * formatting * fix php-cs-fixer
LycheeOrg · Aug 26, 2022 · bb98373 · bb98373
1 parent 9d11738
commit bb98373
Show file tree

Hide file tree

Showing 8 changed files with 232 additions and 266 deletions.
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -30,7 +30,7 @@ jobs:
           coverage: none
       - name: Install PHP-CS-Fixer
         run: |
-          curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.9.5/php-cs-fixer.phar -o .github/build/php-cs-fixer
+          curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.10.0/php-cs-fixer.phar -o .github/build/php-cs-fixer
           chmod a+x .github/build/php-cs-fixer
       - name: Prepare Git User
         run: |

diff --git a/app/Actions/Import/FromServer.php b/app/Actions/Import/FromServer.php
@@ -64,7 +64,7 @@ protected function determineMemLimit(): int
 					break;
 				default:
 					break;
-				// @codeCoverageIgnoreEnd
+					// @codeCoverageIgnoreEnd
 			}
 		}
 

diff --git a/app/Facades/Helpers.php b/app/Facades/Helpers.php
@@ -15,14 +15,14 @@
  * @method static string getDeviceType()
  * @method static string trancateIf32(string $id, int $prevShortId = 0)
  * @method static string getExtension(string $filename, bool $isURI = false)
- * @method static bool hasPermissions(string $path)
- * @method static bool hasFullPermissions(string $path)
- * @method static int gcd(int $a, int $b)
+ * @method static bool   hasPermissions(string $path)
+ * @method static bool   hasFullPermissions(string $path)
+ * @method static int    gcd(int $a, int $b)
  * @method static string str_of_bool(bool $b)
- * @method static int data_index()
- * @method static int data_index_r()
- * @method static void data_index_set(int $idx = 0)
- * @method static array get_all_licenses()
+ * @method static int    data_index()
+ * @method static int    data_index_r()
+ * @method static void   data_index_set(int $idx = 0)
+ * @method static array  get_all_licenses()
  */
 class Helpers extends Facade
 {

diff --git a/app/Facades/Lang.php b/app/Facades/Lang.php
@@ -12,10 +12,10 @@
  *
  * Keep the list of documented method in sync with {@link \App\Locale\Lang}.
  *
- * @method static string get(string $string)
- * @method static string get_code()
- * @method static string[] get_lang()
- * @method static string[] get_lang_available()
+ * @method static string      get(string $string)
+ * @method static string      get_code()
+ * @method static string[]    get_lang()
+ * @method static string[]    get_lang_available()
  * @method static LangFactory factory()
  */
 class Lang extends Facade

diff --git a/app/Models/Album.php b/app/Models/Album.php
@@ -36,10 +36,10 @@
  * @property int               $_lft
  * @property int               $_rgt
  *
- * @method static       AlbumBuilder query()                       Begin querying the model.
- * @method static       AlbumBuilder with(array|string $relations) Begin querying the model with eager loading.
- * @method AlbumBuilder newModelQuery()                            Get a new, "pure" query builder for the model's table without any scopes, eager loading, etc.
- * @method AlbumBuilder newQuery()                                 Get a new query builder for the model's table.
+ * @method static AlbumBuilder query()                       Begin querying the model.
+ * @method static AlbumBuilder with(array|string $relations) Begin querying the model with eager loading.
+ * @method        AlbumBuilder newModelQuery()               Get a new, "pure" query builder for the model's table without any scopes, eager loading, etc.
+ * @method        AlbumBuilder newQuery()                    Get a new query builder for the model's table.
  */
 class Album extends BaseAlbum implements Node
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ protected function determineMemLimit(): int @@
     					break;
     				default:
     					break;
-    				// @codeCoverageIgnoreEnd
+    					// @codeCoverageIgnoreEnd
     			}
     		}
@@ Expand Down @@