Skip to content

Commit c91edf2

Browse files
dragosprotungdragosprotung
authored
Updated dependencies
2 parents f1dae9f + 57d8109 commit c91edf2

20 files changed

Lines changed: 98 additions & 91 deletions

‎.github/workflows/continuous-integration.yml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -22,36 +22,14 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
php-version:
25-
- 8.1
26-
- 8.2
2725
- 8.3
2826
- 8.4
2927
dependencies:
3028
- "highest"
3129
symfony_version:
3230
- ""
3331
include:
34-
# Test against latest Symfony 5.4
35-
- symfony_version: "5.4.*"
36-
php-version: "8.1"
37-
dependencies: "highest"
38-
- symfony_version: "5.4.*"
39-
php-version: "8.2"
40-
dependencies: "highest"
41-
- symfony_version: "5.4.*"
42-
php-version: "8.3"
43-
dependencies: "highest"
44-
- symfony_version: "5.4.*"
45-
php-version: "8.4"
46-
dependencies: "highest"
47-
4832
# Test against latest Symfony 6.4
49-
- symfony_version: "6.4.*"
50-
php-version: "8.1"
51-
dependencies: "highest"
52-
- symfony_version: "6.4.*"
53-
php-version: "8.2"
54-
dependencies: "highest"
5533
- symfony_version: "6.4.*"
5634
php-version: "8.3"
5735
dependencies: "highest"
@@ -60,10 +38,6 @@ jobs:
6038
dependencies: "highest"
6139

6240
# Test against the highest dependencies
63-
- php-version: "8.1"
64-
dependencies: "highest"
65-
- php-version: "8.2"
66-
dependencies: "highest"
6741
- php-version: "8.3"
6842
dependencies: "highest"
6943
- php-version: "8.4"

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ coding-standard-fix:
1919

2020
.PHONY: static-analysis
2121
static-analysis: ## Run static analysis checks
22-
./vendor/bin/phpstan --configuration=config/phpstan.neon
22+
./vendor/bin/phpstan --configuration=config/phpstan.neon --memory-limit=256M
2323
./vendor/bin/psalm --config config/psalm.xml --no-cache
2424

2525
.PHONY: static-analysis-update

‎README.md‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Speicher210 CloudinaryBundle
22

3-
[![Latest Version](https://img.shields.io/github/tag/Speicher210/CloudinaryBundle.svg?style=flat-square)](https://github.com/Speicher210/CloudinaryBundle/releases)
3+
[![Latest Version](https://img.shields.io/github/tag/protung/cloudinary-bundle.svg?style=flat-square)](https://github.com/Speicher210/CloudinaryBundle/releases)
44
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
5-
![GitHub branch checks state](https://img.shields.io/github/checks-status/Speicher210/CloudinaryBundle/master?style=flat-square)
5+
![GitHub branch checks state](https://img.shields.io/github/checks-status/protung/cloudinary-bundle/1.x?style=flat-square)
66

77
## Install
88

@@ -25,25 +25,9 @@ return [
2525
];
2626
```
2727

28-
or
29-
30-
``` php
31-
// app/AppKernel.php
32-
// ...
33-
public function registerBundles()
34-
{
35-
return array(
36-
// ...
37-
new Speicher210\CloudinaryBundle\Speicher210CloudinaryBundle(),
38-
// ...
39-
);
40-
}
41-
// ...
42-
```
43-
4428
## Usage
4529

46-
Configure the connection to cloudinary in your `config.yml` :
30+
Configure the connection to cloudinary in your `config.yaml` :
4731

4832
``` yaml
4933
speicher210_cloudinary:
@@ -54,8 +38,7 @@ speicher210_cloudinary:
5438
access_identifier:
5539
api_key: my-key
5640
api_secret: my-secret
57-
options:
58-
secure: true
41+
secure: true
5942
```
6043
6144
The following services will be available:

‎composer.json‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@
1515
"role": "Developer"
1616
}
1717
],
18-
"homepage": "https://github.com/Speicher210/CloudinaryBundle",
18+
"homepage": "https://github.com/protung/cloudinary-bundle",
1919
"require": {
20-
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
21-
"azjezz/psl": "^2.9.1 || ^3.0.0",
22-
"cloudinary/cloudinary_php": "^2.14.0",
23-
"symfony/console": "^5.4 || ^6.4 || ^7.2",
24-
"symfony/finder": "^5.4 || ^6.4 || ^7.2",
25-
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.2",
26-
"symfony/yaml": "^5.4 || ^6.4 || ^7.2"
20+
"php": "~8.3.0 || ~8.4.0",
21+
"azjezz/psl": "^3.0.0",
22+
"cloudinary/cloudinary_php": "^3.1.1",
23+
"symfony/console": "^6.4 || ^7.2",
24+
"symfony/finder": "^6.4 || ^7.2",
25+
"symfony/framework-bundle": "^6.4 || ^7.2",
26+
"symfony/yaml": "^6.4 || ^7.2"
2727
},
2828
"require-dev": {
29-
"doctrine/coding-standard": "^12.0",
30-
"ergebnis/composer-normalize": "^2.45.0",
29+
"doctrine/coding-standard": "^13.0",
30+
"ergebnis/composer-normalize": "^2.47.0",
3131
"php-standard-library/phpstan-extension": "^2.0.0",
3232
"php-standard-library/psalm-plugin": "^2.3",
33-
"phpstan/phpstan": "^2.1.2",
34-
"phpstan/phpstan-deprecation-rules": "^2.0.1",
35-
"phpstan/phpstan-phpunit": "^2.0.4",
36-
"phpstan/phpstan-strict-rules": "^2.0.3",
37-
"phpstan/phpstan-symfony": "^2.0.2",
38-
"phpunit/phpunit": "^11.5.7",
39-
"psalm/plugin-phpunit": "^0.19.2",
33+
"phpstan/phpstan": "^2.1.17",
34+
"phpstan/phpstan-deprecation-rules": "^2.0.3",
35+
"phpstan/phpstan-phpunit": "^2.0.6",
36+
"phpstan/phpstan-strict-rules": "^2.0.4",
37+
"phpstan/phpstan-symfony": "^2.0.6",
38+
"phpunit/phpunit": "^12.2.6",
39+
"psalm/plugin-phpunit": "^0.19.5",
4040
"roave/security-advisories": "dev-latest",
41-
"twig/twig": "^2.0 || ^3.19",
42-
"vimeo/psalm": "^6.0.0"
41+
"twig/twig": "^3.21",
42+
"vimeo/psalm": "^6.12.1"
4343
},
4444
"suggest": {
4545
"twig/twig": "Allow to use the cloudinary_url function/filter"

‎config/phpstan-baseline.neon‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,55 @@
11
parameters:
22
ignoreErrors:
33
-
4-
message: "#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\\.$#"
4+
message: '#^Argument of an invalid type mixed supplied for foreach, only iterables are supported\.$#'
5+
identifier: foreach.nonIterable
56
count: 1
67
path: ../src/Command/DeleteCommand.php
78

89
-
9-
message: "#^Parameter \\#1 \\$prefix of method Cloudinary\\\\Api\\\\Admin\\\\AdminApi\\:\\:deleteAssetsByPrefix\\(\\) expects string, mixed given\\.$#"
10+
message: '#^Parameter \#1 \$prefix of method Cloudinary\\Api\\Admin\\AdminApi\:\:deleteAssetsByPrefix\(\) expects string, mixed given\.$#'
11+
identifier: argument.type
1012
count: 1
1113
path: ../src/Command/DeleteCommand.php
1214

1315
-
14-
message: "#^Parameter \\#1 \\$publicIds of method Cloudinary\\\\Api\\\\Admin\\\\AdminApi\\:\\:deleteAssets\\(\\) expects array\\|string, mixed given\\.$#"
16+
message: '#^Parameter \#1 \$publicIds of method Cloudinary\\Api\\Admin\\AdminApi\:\:deleteAssets\(\) expects array\|string, mixed given\.$#'
17+
identifier: argument.type
1518
count: 1
1619
path: ../src/Command/DeleteCommand.php
1720

1821
-
19-
message: "#^Parameter \\#2 \\.\\.\\.\\$args of function Psl\\\\Str\\\\format expects float\\|int\\|string, mixed given\\.$#"
22+
message: '#^Parameter \#2 \.\.\.\$args of function Psl\\Str\\format expects float\|int\|string, mixed given\.$#'
23+
identifier: argument.type
2024
count: 2
2125
path: ../src/Command/DeleteCommand.php
2226

2327
-
24-
message: "#^Parameter \\#1 \\$publicId of method Cloudinary\\\\Api\\\\Admin\\\\AdminApi\\:\\:asset\\(\\) expects string, mixed given\\.$#"
28+
message: '#^Parameter \#1 \$publicId of method Cloudinary\\Api\\Admin\\AdminApi\:\:asset\(\) expects string, mixed given\.$#'
29+
identifier: argument.type
2530
count: 1
2631
path: ../src/Command/InfoCommand.php
2732

2833
-
29-
message: "#^Parameter \\#2 \\$derivedResources of method Speicher210\\\\CloudinaryBundle\\\\Command\\\\InfoCommand\\:\\:renderDerivedResources\\(\\) expects array\\<array\\{id\\: string, format\\: string, bytes\\: int, transformation\\: string, url\\: string\\}\\>, mixed given\\.$#"
34+
message: '#^Parameter \#2 \$derivedResources of method Speicher210\\CloudinaryBundle\\Command\\InfoCommand\:\:renderDerivedResources\(\) expects array\<array\{id\: string, format\: string, bytes\: int, transformation\: string, url\: string\}\>, mixed given\.$#'
35+
identifier: argument.type
3036
count: 1
3137
path: ../src/Command/InfoCommand.php
3238

3339
-
34-
message: "#^In method \"Speicher210\\\\CloudinaryBundle\\\\Command\\\\UploadCommand\\:\\:execute\", caught \"Throwable\" must be rethrown\\. Either catch a more specific exception or add a \"throw\" clause in the \"catch\" block to propagate the exception\\. More info\\: http\\://bit\\.ly/failloud$#"
40+
message: '#^Parameter \#1 \$dirs of method Symfony\\Component\\Finder\\Finder\:\:in\(\) expects array\<string\>\|string, mixed given\.$#'
41+
identifier: argument.type
3542
count: 1
3643
path: ../src/Command/UploadCommand.php
3744

3845
-
39-
message: "#^Parameter \\#1 \\$dirs of method Symfony\\\\Component\\\\Finder\\\\Finder\\:\\:in\\(\\) expects array\\<string\\>\\|string, mixed given\\.$#"
46+
message: '#^Parameter \#1 \$node of function Psl\\Filesystem\\get_filename expects non\-empty\-string, string given\.$#'
47+
identifier: argument.type
4048
count: 1
4149
path: ../src/Command/UploadCommand.php
4250

4351
-
44-
message: "#^Parameter \\#1 \\$node of function Psl\\\\Filesystem\\\\get_filename expects non\\-empty\\-string, string given\\.$#"
45-
count: 1
46-
path: ../src/Command/UploadCommand.php
47-
48-
-
49-
message: "#^Parameter \\#1 \\$patterns of method Symfony\\\\Component\\\\Finder\\\\Finder\\:\\:name\\(\\) expects array\\<string\\>\\|string, mixed given\\.$#"
52+
message: '#^Parameter \#1 \$patterns of method Symfony\\Component\\Finder\\Finder\:\:name\(\) expects array\<string\>\|string, mixed given\.$#'
53+
identifier: argument.type
5054
count: 1
5155
path: ../src/Command/UploadCommand.php

‎config/psalm.baseline.xml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<files psalm-version="6.4.0@04f312ac6ea48ba1c3e5db4d815bf6d74641c0ee">
2+
<files psalm-version="6.12.1@e71404b0465be25cf7f8a631b298c01c5ddd864f">
3+
<file src="../src/Cloudinary/Admin.php">
4+
<ClassMustBeFinal>
5+
<code><![CDATA[Admin]]></code>
6+
</ClassMustBeFinal>
7+
</file>
8+
<file src="../src/Cloudinary/Cloudinary.php">
9+
<ClassMustBeFinal>
10+
<code><![CDATA[Cloudinary]]></code>
11+
</ClassMustBeFinal>
12+
</file>
13+
<file src="../src/Cloudinary/Uploader.php">
14+
<ClassMustBeFinal>
15+
<code><![CDATA[Uploader]]></code>
16+
</ClassMustBeFinal>
17+
</file>
318
<file src="../src/Command/InfoCommand.php">
419
<InvalidArrayOffset>
520
<code><![CDATA[$pre[$exp - 1]]]></code>

‎src/Cloudinary/Cloudinary.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@
44

55
namespace Speicher210\CloudinaryBundle\Cloudinary;
66

7+
use Override;
8+
79
class Cloudinary extends \Cloudinary\Cloudinary
810
{
11+
#[Override]
912
public function adminApi(): Admin
1013
{
1114
return new Admin($this->configuration);
1215
}
1316

17+
#[Override]
1418
public function uploadApi(): Uploader
1519
{
1620
return new Uploader($this->configuration);

‎src/Command/DeleteCommand.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Speicher210\CloudinaryBundle\Command;
66

77
use Cloudinary\Api\ApiResponse;
8+
use Override;
89
use Psl\Str;
910
use Speicher210\CloudinaryBundle\Cloudinary\Admin;
1011
use Symfony\Component\Console\Command\Command;
@@ -24,6 +25,7 @@ public function __construct(Admin $cloudinary)
2425
parent::__construct();
2526
}
2627

28+
#[Override]
2729
protected function configure(): void
2830
{
2931
$this
@@ -43,6 +45,7 @@ protected function configure(): void
4345
);
4446
}
4547

48+
#[Override]
4649
protected function execute(InputInterface $input, OutputInterface $output): int
4750
{
4851
$symfonyStyle = new SymfonyStyle($input, $output);

‎src/Command/InfoCommand.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Speicher210\CloudinaryBundle\Command;
66

77
use Cloudinary\Api\ApiResponse;
8+
use Override;
89
use Speicher210\CloudinaryBundle\Cloudinary\Admin;
910
use Symfony\Component\Console\Command\Command;
1011
use Symfony\Component\Console\Helper\TableCell;
@@ -29,6 +30,7 @@ public function __construct(Admin $cloudinary)
2930
parent::__construct();
3031
}
3132

33+
#[Override]
3234
protected function configure(): void
3335
{
3436
$this
@@ -37,6 +39,7 @@ protected function configure(): void
3739
->addArgument('public_id', InputArgument::REQUIRED, 'The public ID of the resource.');
3840
}
3941

42+
#[Override]
4043
protected function execute(InputInterface $input, OutputInterface $output): int
4144
{
4245
$symfonyStyle = new SymfonyStyle($input, $output);

‎src/Command/UploadCommand.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Speicher210\CloudinaryBundle\Command;
66

77
use Cloudinary\Api\ApiResponse;
8+
use Override;
89
use Psl\Filesystem;
910
use Psl\Type;
1011
use Speicher210\CloudinaryBundle\Cloudinary\Uploader;
@@ -29,6 +30,7 @@ public function __construct(Uploader $uploader)
2930
parent::__construct();
3031
}
3132

33+
#[Override]
3234
protected function configure(): void
3335
{
3436
$this
@@ -51,6 +53,7 @@ protected function configure(): void
5153
);
5254
}
5355

56+
#[Override]
5457
protected function execute(InputInterface $input, OutputInterface $output): int
5558
{
5659
$symfonyStyle = new SymfonyStyle($input, $output);

0 commit comments

Comments
 (0)