Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Symfony 7 and remove Symfony 4 #107

Merged
merged 1 commit into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: shivammathur/setup-php@v2
with:
php-version: '7.2'
tools: php-cs-fixer:2.13.1
tools: php-cs-fixer:3.2.1
coverage: none
- name: php-cs-fixer
run: php-cs-fixer fix --dry-run --diff
Expand All @@ -22,23 +22,27 @@ jobs:
strategy:
fail-fast: false
matrix:
sf-version: [ '^4.4', '^5.4', '^6.3' ]
php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
sf-version: [ '^5.4', '^6.4', '^7.0' ]
php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
exclude:
- sf-version: '^4.4'
- sf-version: '^6.4'
php-version: '7.2'
- sf-version: '^6.4'
php-version: '7.3'
- sf-version: '^6.4'
php-version: '7.4'
- sf-version: '^6.4'
php-version: '8.0'
- sf-version: '^4.4'
php-version: '8.1'
- sf-version: '^4.4'
php-version: '8.2'
- sf-version: '^6.3'
- sf-version: '^7.0'
php-version: '7.2'
- sf-version: '^6.3'
- sf-version: '^7.0'
php-version: '7.3'
- sf-version: '^6.3'
- sf-version: '^7.0'
php-version: '7.4'
- sf-version: '^6.3'
- sf-version: '^7.0'
php-version: '8.0'
- sf-version: '^7.0'
php-version: '8.1'

steps:
- uses: actions/checkout@master
Expand Down
18 changes: 18 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

$finder = PhpCsFixer\Finder::create()
->in([__DIR__.'/Cli', __DIR__.'/Sdk']);

$config = new PhpCsFixer\Config();
$config
->setRules(array(
'@Symfony' => true,
'@Symfony:risky' => true,
'array_syntax' => ['syntax' => 'short'],
'class_attributes_separation' => ['elements' => ['const' => 'one']],
))
->setRiskyAllowed(true)
->setFinder($finder)
;

return $config;
14 changes: 0 additions & 14 deletions .php_cs.dist

This file was deleted.

2 changes: 1 addition & 1 deletion Sdk/Api.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

class Api
{
public const ENDPOINT = 'https://insight.symfony.com';
const ENDPOINT = 'https://insight.symfony.com';

private $baseUrl;
private $httpClient;
Expand Down
4 changes: 4 additions & 0 deletions Sdk/Model/Analyses.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,16 @@ class Analyses
* @Type("array<SensioLabs\Insight\Sdk\Model\Link>")
* @XmlList(inline = true, entry = "link")
*/
#[Type("array<SensioLabs\Insight\Sdk\Model\Link>")]
#[XmlList(inline: true, entry: "link")]
private $links = [];

/**
* @Type("array<SensioLabs\Insight\Sdk\Model\Analysis>")
* @XmlList(inline = true, entry = "analysis")
*/
#[Type("array<SensioLabs\Insight\Sdk\Model\Analysis>")]
#[XmlList(inline: true, entry: "analysis")]
private $analyses = [];

/**
Expand Down
41 changes: 33 additions & 8 deletions Sdk/Model/Analysis.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,99 +27,124 @@ class Analysis
* @Type("array<SensioLabs\Insight\Sdk\Model\Link>")
* @XmlList(inline = true, entry = "link")
*/
#[Type("array<SensioLabs\Insight\Sdk\Model\Link>")]
#[XmlList(inline: true, entry: "link")]
private $links = [];

/** @Type("integer") */
#[Type("integer")]
private $number;

/** @Type("string") */
#[Type("string")]
private $grade;

/**
* @Type("string")
* @SerializedName("next-grade")
*/
#[Type("string")]
#[SerializedName("next-grade")]
private $nextGrade;

/** @Type("array<string>") */
#[Type("array<string>")]
private $grades = [];

/**
* @Type("float")
* @SerializedName("remediation-cost")
*/
#[Type("float")]
#[SerializedName("remediation-cost")]
private $remediationCost;

/**
* @Type("float")
* @SerializedName("remediation-cost-for-next-grade")
*/
#[Type("float")]
#[SerializedName("remediation-cost-for-next-grade")]
private $remediationCostForNextGrade;

/**
* @Type("integer")
* @SerializedName("nb-violations")
*/
#[Type("integer")]
#[SerializedName("nb-violations")]
private $nbViolations;

/**
* @Type("DateTime")
* @SerializedName("begin-at")
*/
#[Type("DateTime")]
#[SerializedName("begin-at")]
private $beginAt;

/**
* @Type("DateTime")
* @SerializedName("end-at")
*/
#[Type("DateTime")]
#[SerializedName("end-at")]
private $endAt;

/** @Type("integer") */
#[Type("integer")]
private $duration;

/**
* @Type("string")
* @SerializedName("failure-message")
*/
#[Type("string")]
#[SerializedName("failure-message")]
private $failureMessage;

/**
* @Type("string")
* @SerializedName("failure-code")
*/
#[Type("string")]
#[SerializedName("failure-code")]
private $failureCode;

/** @Type("boolean") */
#[Type("boolean")]
private $failed;

/** @Type("string") */
#[Type("string")]
private $status;

/**
* @Type("string")
* @SerializedName("status-message")
*/
#[Type("string")]
#[SerializedName("status-message")]
private $statusMessage;

/**
* @Type("boolean")
* @SerializedName("altered")
*/
#[Type("boolean")]
#[SerializedName("altered")]
private $isAltered;

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

/**
* @Type("string")
* @SerializedName("branch")
*/
/** @Type("string") */
#[Type("string")]
private $branch;

/**
* @Type("string")
* @SerializedName("reference")
*/
/** @Type("string") */
#[Type("string")]
private $reference;

/**
Expand Down
6 changes: 6 additions & 0 deletions Sdk/Model/Link.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,24 @@ class Link
* @XmlAttribute
* @Type("string")
*/
#[XmlAttribute]
#[Type("string")]
private $href;

/**
* @XmlAttribute
* @Type("string")
*/
#[XmlAttribute]
#[Type("string")]
private $rel;

/**
* @XmlAttribute
* @Type("string")
*/
#[XmlAttribute]
#[Type("string")]
private $type;

/**
Expand Down
16 changes: 16 additions & 0 deletions Sdk/Model/Project.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class Project
/**
* @Exclude()
*/
#[Exclude]
public static $types = [
self::TYPE_SYMFONY2_WEB_PROJECT => 'Symfony2 Web Project',
self::TYPE_SYMFONY1_WEB_PROJECT => 'symfony1 Web Project',
Expand All @@ -52,45 +53,60 @@ class Project
* @Type("array<SensioLabs\Insight\Sdk\Model\Link>")
* @XmlList(inline = true, entry = "link")
*/
#[Type("array<SensioLabs\Insight\Sdk\Model\Link>")]
#[XmlList(inline: true, entry: "link")]
private $links = [];

/**
* @Type("string")
* @SerializedName("id")
*/
#[Type("string")]
#[SerializedName("id")]
private $uuid;

/** @Type("string") */
#[Type("string")]
private $name;

/** @Type("string") */
#[Type("string")]
private $configuration;

/** @Type("string") */
#[Type("string")]
private $description;

/** @Type("integer") */
#[Type("integer")]
private $type;

/**
* @Type("string")
* @SerializedName("repository-url")
*/
#[Type("string")]
#[SerializedName("repository-url")]
private $repositoryUrl;

/** @Type("boolean") */
#[Type("boolean")]
private $private;

/**
* @Type("boolean")
* @SerializedName("report-available")
*/
#[Type("boolean")]
#[SerializedName("report-available")]
private $reportAvailable;

/**
* @Type("SensioLabs\Insight\Sdk\Model\Analysis")
* @SerializedName("last-analysis")
*/
#[Type("SensioLabs\Insight\Sdk\Model\Analysis")]
#[SerializedName("last-analysis")]
private $lastAnalysis;

public function toArray()
Expand Down
11 changes: 11 additions & 0 deletions Sdk/Model/Projects.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,36 +19,47 @@
/**
* @XmlRoot("projects")
*/
#[XmlRoot("projects")]
class Projects
{
/**
* @XmlAttribute
* @Type("integer")
*/
#[XmlAttribute]
#[Type("integer")]
private $page;

/**
* @XmlAttribute
* @Type("integer")
*/
#[XmlAttribute]
#[Type("integer")]
private $total;

/**
* @XmlAttribute
* @Type("integer")
*/
#[XmlAttribute]
#[Type("integer")]
private $limit;

/**
* @Type("array<SensioLabs\Insight\Sdk\Model\Link>")
* @XmlList(inline = true, entry = "link")
*/
#[Type("array<SensioLabs\Insight\Sdk\Model\Link>")]
#[XmlList(inline: true, entry: "link")]
private $links = [];

/**
* @Type("array<SensioLabs\Insight\Sdk\Model\Project>")
* @XmlList(inline = true, entry = "project")
*/
#[Type("array<SensioLabs\Insight\Sdk\Model\Project>")]
#[XmlList(inline: true, entry: "project")]
private $projects = [];

/**
Expand Down
Loading
Loading