Laravel 10

Author: overtrue

composer.json

@@ -8,7 +8,7 @@
  }
  ],
  "require": {
- "laravel/framework": "^9.0",
+ "laravel/framework": "^9.0|^10.0",
  "ext-json": "*"
  },
  "autoload": {
@@ -17,8 +17,9 @@
  }
  },
  "require-dev": {
- "phpunit/phpunit": "^9.5",
- "friendsofphp/php-cs-fixer": "^3.0"
+ "phpunit/phpunit": "^10.0",
+ "brainmaestro/composer-git-hooks": "dev-master",
+ "laravel/pint": "^1.5"
  },
  "extra": {
  "laravel": {
@@ -50,9 +51,9 @@
  "cghooks update"
  ],
  "cghooks": "vendor/bin/cghooks",
- "check-style": "php-cs-fixer fix --using-cache=no --diff --dry-run --ansi",
- "fix-style": "php-cs-fixer fix --using-cache=no --ansi",
- "test": "vendor/bin/phpunit  --colors=always --testdox"
+ "check-style": "vendor/bin/pint --test",
+ "fix-style": "vendor/bin/pint",
+ "test": "vendor/bin/phpunit --colors=always"
  },
  "scripts-descriptions": {
  "test": "Run all tests.",

phpunit.xml

@@ -1,27 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
- backupStaticAttributes="false"
- bootstrap="vendor/autoload.php"
- colors="true"
- convertErrorsToExceptions="true"
- convertNoticesToExceptions="true"
- convertWarningsToExceptions="true"
- processIsolation="false"
- stopOnFailure="false">
- <testsuites>
- <testsuite name="Application Test Suite">
- <directory>./tests/</directory>
- </testsuite>
- </testsuites>
- <filter>
- <whitelist>
- <directory suffix=".php">src/</directory>
- <exclude>
- <directory suffix="Exception.php">src/</directory>
- </exclude>
- </whitelist>
- </filter>
- <php>
- <const name="PHPUNIT_RUNNING" value="true" />
- </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+ <coverage>
+ <include>
+ <directory suffix=".php">src/</directory>
+ </include>
+ <exclude>
+ <directory suffix="Exception.php">src/</directory>
+ </exclude>
+ </coverage>
+ <testsuites>
+ <testsuite name="Application Test Suite">
+ <directory>./tests/</directory>
+ </testsuite>
+ </testsuites>
+ <php>
+ <const name="PHPUNIT_RUNNING" value="true"/>
+ </php>
 </phpunit>

src/Events/FileDeleted.php

@@ -8,9 +8,6 @@ class FileDeleted
 {
  public UploadedFile $file;
 
- /**
- * @param \Illuminate\Http\UploadedFile $file
- */
  public function __construct(UploadedFile $file)
  {
  $this->file = $file;

src/Events/FileDeleting.php

@@ -10,8 +10,6 @@ class FileDeleting
 
  /**
  * Create a new event instance.
- *
- * @param \Illuminate\Http\UploadedFile $file
  */
  public function __construct(UploadedFile $file)
  {

src/Events/FileUploaded.php

@@ -9,14 +9,11 @@
 class FileUploaded
 {
  public UploadedFile $file;
+
  public Response $response;
+
  public Strategy $strategy;
 
- /**
- * @param \Illuminate\Http\UploadedFile $file
- * @param \Overtrue\LaravelUploader\Response $response
- * @param \Overtrue\LaravelUploader\Strategy $strategy
- */
  public function __construct(UploadedFile $file, Response $response, Strategy $strategy)
  {
  $this->file = $file;

src/Events/FileUploading.php

@@ -8,9 +8,6 @@ class FileUploading
 {
  public UploadedFile $file;
 
- /**
- * @param \Illuminate\Http\UploadedFile $file
- */
  public function __construct(UploadedFile $file)
  {
  $this->file = $file;

src/Http/Controllers/UploadController.php

@@ -11,7 +11,6 @@ class UploadController extends BaseController
  /**
  * Handle file upload.
  *
- * @param Request $request
  *
  * @return \Overtrue\LaravelUploader\Response
  */

src/LaravelUploader.php

@@ -8,13 +8,11 @@
 class LaravelUploader extends Facade
 {
  /**
- * @param array $options
- *
  * @throws BindingResolutionException
  */
  public static function routes(array $options = [])
  {
- if (!self::$app->routesAreCached()) {
+ if (! self::$app->routesAreCached()) {
  self::$app->make('router')->post(
  'files/upload',
  \array_merge([

src/Response.php

@@ -10,21 +10,29 @@
 class Response implements Jsonable, Arrayable
 {
  public string $disk;
+
  public string $path;
+
  public ?string $mime;
+
  public string $size;
+
  public string $url;
+
  public string $relativeUrl;
+
  public string $filename;
+
  public string $extension;
+
  public string $originalName;
+
  public UploadedFile $file;
+
  public Strategy $strategy;
 
  /**
- * @param string $path
- * @param \Overtrue\LaravelUploader\Strategy $strategy
- * @param \Illuminate\Http\UploadedFile $file
+ * @param \Overtrue\LaravelUploader\Strategy $strategy
  */
  public function __construct(string $path, Strategy $strategy, UploadedFile $file)
  {
@@ -54,8 +62,7 @@ public function __construct(string $path, Strategy $strategy, UploadedFile $file
  }
 
  /**
- * @param int $options
- *
+ * @param int $options
  * @return string
  */
  public function toJson($options = 0)

src/Strategy.php

@@ -12,17 +12,19 @@
 class Strategy
 {
  protected string $disk;
+
  protected string $directory;
+
  protected array $mimes = [];
+
  protected string $name;
+
  protected int $maxSize = 0;
+
  protected string $filenameType;
+
  protected UploadedFile $file;
 
- /**
- * @param array $config
- * @param UploadedFile $file
- */
  public function __construct(array $config, UploadedFile $file)
  {
  $config = new Fluent($config);
@@ -117,18 +119,16 @@ public function isValidSize()
 
  public function validate()
  {
- if (!$this->isValidMime()) {
+ if (! $this->isValidMime()) {
  \abort(422, \sprintf('Invalid mime "%s".', $this->file->getClientMimeType()));
  }
 
- if (!$this->isValidSize()) {
+ if (! $this->isValidSize()) {
  \abort(422, \sprintf('File has too large size("%s").', $this->file->getSize()));
  }
  }
 
  /**
- * @param array $options
- *
  * @return \Overtrue\LaravelUploader\Response
  */
  public function upload(array $options = [])
@@ -156,7 +156,6 @@ public function upload(array $options = [])
  /**
  * Replace date variable in dir path.
  *
- * @param string $dir
  *
  * @return string
  */
@@ -176,23 +175,22 @@ protected function formatDirectory(string $dir)
 
  /**
  * @param mixed $humanFileSize
- *
  * @return int
  */
  protected function filesize2bytes($humanFileSize)
  {
- $bytesUnits = array(
+ $bytesUnits = [
  'K' => 1024,
  'M' => 1024 * 1024,
  'G' => 1024 * 1024 * 1024,
  'T' => 1024 * 1024 * 1024 * 1024,
  'P' => 1024 * 1024 * 1024 * 1024 * 1024,
- );
+ ];
 
  $bytes = floatval($humanFileSize);
 
  if (preg_match('~([KMGTP])$~si', rtrim($humanFileSize, 'B'), $matches)
- && !empty($bytesUnits[\strtoupper($matches[1])])) {
+ && ! empty($bytesUnits[\strtoupper($matches[1])])) {
  $bytes *= $bytesUnits[\strtoupper($matches[1])];
  }