From 28f417922cd2c7b238f96dbd52c580b6133d1c28 Mon Sep 17 00:00:00 2001 From: Bas Peeters Date: Sun, 21 Jul 2019 03:26:51 +0800 Subject: [PATCH 1/2] Composer update, not install, for tci coverage Travis CI build for php 7.2 with `coverage=1 lint=1` was failing when executing `./bin/compile` at the end of the script stage. Before this command, `composer update` is called which updates the lock file with dependencies in way which causes namespace errors. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ff77022d..355a7e99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ before_install: install: - if [[ $coverage = 1 ]]; then composer require --dev --no-update 'phpunit/php-code-coverage:^5.3'; fi - - if [[ ! $deps ]]; then composer update --prefer-dist --no-progress --no-suggest --ansi; fi + - if [[ ! $deps ]]; then composer install --prefer-dist --no-progress --no-suggest --ansi; fi - if [[ $deps = 'low' ]]; then composer update --prefer-dist --no-progress --no-suggest --prefer-stable --prefer-lowest --ansi; fi script: From 94a2c3a231471d7771ccb2b3b5830b5f2f7ef092 Mon Sep 17 00:00:00 2001 From: Bas Peeters Date: Sun, 21 Jul 2019 03:41:52 +0800 Subject: [PATCH 2/2] Adapt e2e files to test expectancies Builds were still failing after 0411921c22f5f3d1e465ed9b6ac36d74c1f19ea9 because since they started failing a while back, the class files for the 2e2 tests stopped matching the produced classes: The CI process never reached the point where they were tested. This commit adapts the files accordingly. --- tests/e2e/src/AppBundle/Entity/Person.php | 18 +++++++++--------- .../e2e/src/AppBundle/Entity/PostalAddress.php | 12 ++++++------ tests/e2e/src/AppBundle/Entity/Thing.php | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/e2e/src/AppBundle/Entity/Person.php b/tests/e2e/src/AppBundle/Entity/Person.php index d21593e2..170d5aed 100644 --- a/tests/e2e/src/AppBundle/Entity/Person.php +++ b/tests/e2e/src/AppBundle/Entity/Person.php @@ -31,7 +31,7 @@ class Person /** * @var string|null Family name. In the U.S., the last name of an Person. This can be used along with givenName instead of the name property. * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/familyName") */ private $familyName; @@ -39,7 +39,7 @@ class Person /** * @var string|null Given name. In the U.S., the first name of a Person. This can be used along with familyName instead of the name property. * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/givenName") */ private $givenName; @@ -47,7 +47,7 @@ class Person /** * @var string|null an additional name for a Person, can be used for a middle name * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/additionalName") */ private $additionalName; @@ -55,7 +55,7 @@ class Person /** * @var string|null Gender of the person. While http://schema.org/Male and http://schema.org/Female may be used, text strings are also acceptable for people who do not identify as a binary gender. * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/gender") */ private $gender; @@ -71,7 +71,7 @@ class Person /** * @var \DateTimeInterface|null date of birth * - * @ORM\Column(type="date", nullable=true) + * @ORM\Column(type="date",nullable=true) * @ApiProperty(iri="http://schema.org/birthDate") * @Assert\Date */ @@ -80,7 +80,7 @@ class Person /** * @var string|null the telephone number * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/telephone") */ private $telephone; @@ -88,7 +88,7 @@ class Person /** * @var string|null email address * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/email") * @Assert\Email */ @@ -97,7 +97,7 @@ class Person /** * @var string|null URL of the item * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/url") * @Assert\Url */ @@ -106,7 +106,7 @@ class Person /** * @var string|null the job title of the person (for example, Financial Manager) * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/jobTitle") */ private $jobTitle; diff --git a/tests/e2e/src/AppBundle/Entity/PostalAddress.php b/tests/e2e/src/AppBundle/Entity/PostalAddress.php index e3290a2a..233e61f5 100644 --- a/tests/e2e/src/AppBundle/Entity/PostalAddress.php +++ b/tests/e2e/src/AppBundle/Entity/PostalAddress.php @@ -30,7 +30,7 @@ class PostalAddress /** * @var string|null The country. For example, USA. You can also provide the two-letter \[ISO 3166-1 alpha-2 country code\](http://en.wikipedia.org/wiki/ISO\_3166-1). * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/addressCountry") */ private $addressCountry; @@ -38,7 +38,7 @@ class PostalAddress /** * @var string|null The locality. For example, Mountain View. * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/addressLocality") */ private $addressLocality; @@ -46,7 +46,7 @@ class PostalAddress /** * @var string|null The region. For example, CA. * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/addressRegion") */ private $addressRegion; @@ -54,7 +54,7 @@ class PostalAddress /** * @var string|null the post office box number for PO box addresses * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/postOfficeBoxNumber") */ private $postOfficeBoxNumber; @@ -62,7 +62,7 @@ class PostalAddress /** * @var string|null The postal code. For example, 94043. * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/postalCode") */ private $postalCode; @@ -70,7 +70,7 @@ class PostalAddress /** * @var string|null The street address. For example, 1600 Amphitheatre Pkwy. * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/streetAddress") */ private $streetAddress; diff --git a/tests/e2e/src/AppBundle/Entity/Thing.php b/tests/e2e/src/AppBundle/Entity/Thing.php index dc2102e0..ab1d4d9f 100644 --- a/tests/e2e/src/AppBundle/Entity/Thing.php +++ b/tests/e2e/src/AppBundle/Entity/Thing.php @@ -30,7 +30,7 @@ class Thing /** * @var string|null the name of the item * - * @ORM\Column(type="text", nullable=true) + * @ORM\Column(type="text",nullable=true) * @ApiProperty(iri="http://schema.org/name") */ private $name;