Skip to content

Commit f657ce9

Browse files
tareqastareqas
authored
Add Symfony 7 and remove Symfony 4 (#107)
1 parent 872986e commit f657ce9

File tree

12 files changed

+124
-41
lines changed

12 files changed

+124
-41
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: shivammathur/setup-php@v2
1111
with:
1212
php-version: '7.2'
13-
tools: php-cs-fixer:2.13.1
13+
tools: php-cs-fixer:3.2.1
1414
coverage: none
1515
- name: php-cs-fixer
1616
run: php-cs-fixer fix --dry-run --diff
@@ -22,23 +22,27 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
sf-version: [ '^4.4', '^5.4', '^6.3' ]
26-
php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
25+
sf-version: [ '^5.4', '^6.4', '^7.0' ]
26+
php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
2727
exclude:
28-
- sf-version: '^4.4'
28+
- sf-version: '^6.4'
29+
php-version: '7.2'
30+
- sf-version: '^6.4'
31+
php-version: '7.3'
32+
- sf-version: '^6.4'
33+
php-version: '7.4'
34+
- sf-version: '^6.4'
2935
php-version: '8.0'
30-
- sf-version: '^4.4'
31-
php-version: '8.1'
32-
- sf-version: '^4.4'
33-
php-version: '8.2'
34-
- sf-version: '^6.3'
36+
- sf-version: '^7.0'
3537
php-version: '7.2'
36-
- sf-version: '^6.3'
38+
- sf-version: '^7.0'
3739
php-version: '7.3'
38-
- sf-version: '^6.3'
40+
- sf-version: '^7.0'
3941
php-version: '7.4'
40-
- sf-version: '^6.3'
42+
- sf-version: '^7.0'
4143
php-version: '8.0'
44+
- sf-version: '^7.0'
45+
php-version: '8.1'
4246

4347
steps:
4448
- uses: actions/checkout@master

‎.php-cs-fixer.dist.php‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
$finder = PhpCsFixer\Finder::create()
4+
->in([__DIR__.'/Cli', __DIR__.'/Sdk']);
5+
6+
$config = new PhpCsFixer\Config();
7+
$config
8+
->setRules(array(
9+
'@Symfony' => true,
10+
'@Symfony:risky' => true,
11+
'array_syntax' => ['syntax' => 'short'],
12+
'class_attributes_separation' => ['elements' => ['const' => 'one']],
13+
))
14+
->setRiskyAllowed(true)
15+
->setFinder($finder)
16+
;
17+
18+
return $config;

‎.php_cs.dist‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎Sdk/Api.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
class Api
3333
{
34-
public const ENDPOINT = 'https://insight.symfony.com';
34+
const ENDPOINT = 'https://insight.symfony.com';
3535

3636
private $baseUrl;
3737
private $httpClient;

‎Sdk/Model/Analyses.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,16 @@ class Analyses
2020
* @Type("array<SensioLabs\Insight\Sdk\Model\Link>")
2121
* @XmlList(inline = true, entry = "link")
2222
*/
23+
#[Type("array<SensioLabs\Insight\Sdk\Model\Link>")]
24+
#[XmlList(inline: true, entry: "link")]
2325
private $links = [];
2426

2527
/**
2628
* @Type("array<SensioLabs\Insight\Sdk\Model\Analysis>")
2729
* @XmlList(inline = true, entry = "analysis")
2830
*/
31+
#[Type("array<SensioLabs\Insight\Sdk\Model\Analysis>")]
32+
#[XmlList(inline: true, entry: "analysis")]
2933
private $analyses = [];
3034

3135
/**

‎Sdk/Model/Analysis.php‎

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,99 +27,124 @@ class Analysis
2727
* @Type("array<SensioLabs\Insight\Sdk\Model\Link>")
2828
* @XmlList(inline = true, entry = "link")
2929
*/
30+
#[Type("array<SensioLabs\Insight\Sdk\Model\Link>")]
31+
#[XmlList(inline: true, entry: "link")]
3032
private $links = [];
3133

3234
/** @Type("integer") */
35+
#[Type("integer")]
3336
private $number;
3437

3538
/** @Type("string") */
39+
#[Type("string")]
3640
private $grade;
3741

3842
/**
3943
* @Type("string")
4044
* @SerializedName("next-grade")
4145
*/
46+
#[Type("string")]
47+
#[SerializedName("next-grade")]
4248
private $nextGrade;
4349

4450
/** @Type("array<string>") */
51+
#[Type("array<string>")]
4552
private $grades = [];
4653

4754
/**
4855
* @Type("float")
4956
* @SerializedName("remediation-cost")
5057
*/
58+
#[Type("float")]
59+
#[SerializedName("remediation-cost")]
5160
private $remediationCost;
5261

5362
/**
5463
* @Type("float")
5564
* @SerializedName("remediation-cost-for-next-grade")
5665
*/
66+
#[Type("float")]
67+
#[SerializedName("remediation-cost-for-next-grade")]
5768
private $remediationCostForNextGrade;
5869

5970
/**
6071
* @Type("integer")
6172
* @SerializedName("nb-violations")
6273
*/
74+
#[Type("integer")]
75+
#[SerializedName("nb-violations")]
6376
private $nbViolations;
6477

6578
/**
6679
* @Type("DateTime")
6780
* @SerializedName("begin-at")
6881
*/
82+
#[Type("DateTime")]
83+
#[SerializedName("begin-at")]
6984
private $beginAt;
7085

7186
/**
7287
* @Type("DateTime")
7388
* @SerializedName("end-at")
7489
*/
90+
#[Type("DateTime")]
91+
#[SerializedName("end-at")]
7592
private $endAt;
7693

7794
/** @Type("integer") */
95+
#[Type("integer")]
7896
private $duration;
7997

8098
/**
8199
* @Type("string")
82100
* @SerializedName("failure-message")
83101
*/
102+
#[Type("string")]
103+
#[SerializedName("failure-message")]
84104
private $failureMessage;
85105

86106
/**
87107
* @Type("string")
88108
* @SerializedName("failure-code")
89109
*/
110+
#[Type("string")]
111+
#[SerializedName("failure-code")]
90112
private $failureCode;
91113

92114
/** @Type("boolean") */
115+
#[Type("boolean")]
93116
private $failed;
94117

95118
/** @Type("string") */
119+
#[Type("string")]
96120
private $status;
97121

98122
/**
99123
* @Type("string")
100124
* @SerializedName("status-message")
101125
*/
126+
#[Type("string")]
127+
#[SerializedName("status-message")]
102128
private $statusMessage;
103129

104130
/**
105131
* @Type("boolean")
106132
* @SerializedName("altered")
107133
*/
134+
#[Type("boolean")]
135+
#[SerializedName("altered")]
108136
private $isAltered;
109137

110138
/** @Type("SensioLabs\Insight\Sdk\Model\Violations") */
139+
#[Type("SensioLabs\Insight\Sdk\Model\Violations")]
111140
private $violations;
112141

113-
/**
114-
* @Type("string")
115-
* @SerializedName("branch")
116-
*/
142+
/** @Type("string") */
143+
#[Type("string")]
117144
private $branch;
118145

119-
/**
120-
* @Type("string")
121-
* @SerializedName("reference")
122-
*/
146+
/** @Type("string") */
147+
#[Type("string")]
123148
private $reference;
124149

125150
/**

‎Sdk/Model/Link.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,24 @@ class Link
2020
* @XmlAttribute
2121
* @Type("string")
2222
*/
23+
#[XmlAttribute]
24+
#[Type("string")]
2325
private $href;
2426

2527
/**
2628
* @XmlAttribute
2729
* @Type("string")
2830
*/
31+
#[XmlAttribute]
32+
#[Type("string")]
2933
private $rel;
3034

3135
/**
3236
* @XmlAttribute
3337
* @Type("string")
3438
*/
39+
#[XmlAttribute]
40+
#[Type("string")]
3541
private $type;
3642

3743
/**

‎Sdk/Model/Project.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ class Project
3535
/**
3636
* @Exclude()
3737
*/
38+
#[Exclude]
3839
public static $types = [
3940
self::TYPE_SYMFONY2_WEB_PROJECT => 'Symfony2 Web Project',
4041
self::TYPE_SYMFONY1_WEB_PROJECT => 'symfony1 Web Project',
@@ -52,45 +53,60 @@ class Project
5253
* @Type("array<SensioLabs\Insight\Sdk\Model\Link>")
5354
* @XmlList(inline = true, entry = "link")
5455
*/
56+
#[Type("array<SensioLabs\Insight\Sdk\Model\Link>")]
57+
#[XmlList(inline: true, entry: "link")]
5558
private $links = [];
5659

5760
/**
5861
* @Type("string")
5962
* @SerializedName("id")
6063
*/
64+
#[Type("string")]
65+
#[SerializedName("id")]
6166
private $uuid;
6267

6368
/** @Type("string") */
69+
#[Type("string")]
6470
private $name;
6571

6672
/** @Type("string") */
73+
#[Type("string")]
6774
private $configuration;
6875

6976
/** @Type("string") */
77+
#[Type("string")]
7078
private $description;
7179

7280
/** @Type("integer") */
81+
#[Type("integer")]
7382
private $type;
7483

7584
/**
7685
* @Type("string")
7786
* @SerializedName("repository-url")
7887
*/
88+
#[Type("string")]
89+
#[SerializedName("repository-url")]
7990
private $repositoryUrl;
8091

8192
/** @Type("boolean") */
93+
#[Type("boolean")]
8294
private $private;
8395

8496
/**
8597
* @Type("boolean")
8698
* @SerializedName("report-available")
8799
*/
100+
#[Type("boolean")]
101+
#[SerializedName("report-available")]
88102
private $reportAvailable;
89103

90104
/**
91105
* @Type("SensioLabs\Insight\Sdk\Model\Analysis")
92106
* @SerializedName("last-analysis")
93107
*/
108+
#[Type("SensioLabs\Insight\Sdk\Model\Analysis")]
109+
#[SerializedName("last-analysis")]
94110
private $lastAnalysis;
95111

96112
public function toArray()

‎Sdk/Model/Projects.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,47 @@
1919
/**
2020
* @XmlRoot("projects")
2121
*/
22+
#[XmlRoot("projects")]
2223
class Projects
2324
{
2425
/**
2526
* @XmlAttribute
2627
* @Type("integer")
2728
*/
29+
#[XmlAttribute]
30+
#[Type("integer")]
2831
private $page;
2932

3033
/**
3134
* @XmlAttribute
3235
* @Type("integer")
3336
*/
37+
#[XmlAttribute]
38+
#[Type("integer")]
3439
private $total;
3540

3641
/**
3742
* @XmlAttribute
3843
* @Type("integer")
3944
*/
45+
#[XmlAttribute]
46+
#[Type("integer")]
4047
private $limit;
4148

4249
/**
4350
* @Type("array<SensioLabs\Insight\Sdk\Model\Link>")
4451
* @XmlList(inline = true, entry = "link")
4552
*/
53+
#[Type("array<SensioLabs\Insight\Sdk\Model\Link>")]
54+
#[XmlList(inline: true, entry: "link")]
4655
private $links = [];
4756

4857
/**
4958
* @Type("array<SensioLabs\Insight\Sdk\Model\Project>")
5059
* @XmlList(inline = true, entry = "project")
5160
*/
61+
#[Type("array<SensioLabs\Insight\Sdk\Model\Project>")]
62+
#[XmlList(inline: true, entry: "project")]
5263
private $projects = [];
5364

5465
/**

0 commit comments

Comments
 (0)