fixes for 1.15 (#2704)

tests/DataFixtures/ActivityFixtures.php

@@ -119,8 +119,8 @@ final class ActivityFixtures implements TestFixture
             $activity = new Activity();
             $activity
                 ->setProject($project)
-                ->setName($faker->bs . ($visible ? '' : ' (x)'))
-                ->setComment($faker->text)
+                ->setName($faker->company() . ($visible ? '' : ' (x)'))
+                ->setComment($faker->text())
                 ->setVisible($visible)
             ;
 

tests/DataFixtures/CustomerFixtures.php

@@ -80,13 +80,14 @@ final class CustomerFixtures implements TestFixture
             }
             $customer = new Customer();
             $customer
-                ->setCurrency($faker->currencyCode)
-                ->setName($faker->company . ($visible ? '' : ' (x)'))
-                ->setAddress($faker->address)
-                ->setComment($faker->text)
-                ->setNumber('C-' . $faker->ean8)
-                ->setCountry($faker->countryCode)
-                ->setTimezone($faker->timezone)
+                ->setCurrency($faker->currencyCode())
+                ->setName($faker->company() . ($visible ? '' : ' (x)'))
+                ->setAddress($faker->address())
+                ->setEmail($faker->safeEmail())
+                ->setComment($faker->text())
+                ->setNumber('C-' . $faker->ean8())
+                ->setCountry($faker->countryCode())
+                ->setTimezone($faker->timezone())
                 ->setVisible($visible)
             ;
 

tests/DataFixtures/InvoiceTemplateFixtures.php

@@ -32,7 +32,7 @@ class InvoiceTemplateFixtures implements TestFixture
         $template
             ->setName('Invoice')
             ->setTitle('Your company name')
-            ->setCompany($faker->company)
+            ->setCompany($faker->company())
             ->setVat(19)
             ->setDueDays(14)
             ->setPaymentTerms(
@@ -42,10 +42,10 @@ class InvoiceTemplateFixtures implements TestFixture
                 'as reference.'
             )
             ->setAddress(
-                $faker->streetAddress . PHP_EOL .
-                $faker->city . ', ' . $faker->stateAbbr . ' ' . $faker->postcode . PHP_EOL .
-                'Phone: ' . $faker->phoneNumber . PHP_EOL .
-                'Email: ' . $faker->safeEmail
+                $faker->streetAddress() . PHP_EOL .
+                $faker->city() . ' ' . $faker->postcode() . ', ' . $faker->country() . PHP_EOL .
+                'Phone: ' . $faker->phoneNumber() . PHP_EOL .
+                'Email: ' . $faker->safeEmail()
             )
             ->setLanguage('en')
         ;

tests/DataFixtures/ProjectFixtures.php

@@ -98,9 +98,9 @@ final class ProjectFixtures implements TestFixture
                 $visible = $this->isVisible;
             }
             $project = new Project();
-            $project->setName($faker->catchPhrase . ($visible ? '' : ' (x)'));
+            $project->setName($faker->company() . ($visible ? '' : ' (x)'));
             $project->setBudget(rand(0, 10000));
-            $project->setComment($faker->text);
+            $project->setComment($faker->text());
             $project->setCustomer($customers[array_rand($customers)]);
             $project->setVisible($visible);
 

tests/DataFixtures/TeamFixtures.php

@@ -11,7 +11,6 @@ namespace App\Tests\DataFixtures;
 
 use App\Entity\Customer;
 use App\Entity\Team;
-use App\Entity\TeamMember;
 use App\Entity\User;
 use Doctrine\Persistence\ObjectManager;
 
@@ -107,15 +106,9 @@ final class TeamFixtures implements TestFixture
                 }
             }
 
-            $member = new TeamMember();
-            $member->setUser($lead);
-            $member->setTeamlead(true);
-
             $team = new Team();
-            $team
-                ->setName('Testing: ' . uniqid())
-                ->addMember($member)
-            ;
+            $team->setName('Testing: ' . uniqid());
+            $team->addTeamlead($lead);
 
             if ($this->addUser) {
                 $userToAdd = null;

tests/DataFixtures/TimesheetFixtures.php

@@ -246,7 +246,7 @@ final class TimesheetFixtures implements TestFixture
         $manager->flush();
 
         for ($i = 0; $i < $this->amount; $i++) {
-            $description = $faker->text;
+            $description = $faker->text();
             if ($this->allowEmptyDescriptions) {
                 if ($i % 3 == 0) {
                     $description = null;
@@ -292,7 +292,7 @@ final class TimesheetFixtures implements TestFixture
                 $user,
                 $activity,
                 $project,
-                $faker->text,
+                $faker->text(),
                 $this->getDateTime($i),
                 $tags,
                 false

tests/Entity/TeamTest.php

@@ -75,7 +75,16 @@ class TeamTest extends TestCase
         self::assertFalse($sut->hasMember($member));
         $sut->removeMember($member);
         $sut->removeMember($member2);
+        self::assertFalse($sut->hasUser($user));
         $sut->addMember($member);
+
+        self::assertTrue($sut->hasUser($user));
+        self::assertFalse($sut->isTeamlead($user));
+        $sut->addTeamlead($user);
+        self::assertTrue($sut->isTeamlead($user));
+        $sut->addUser($user);
+        self::assertTrue($sut->isTeamlead($user));
+
         self::assertCount(1, $sut->getMembers());
         $sut->removeMember($member2);
         self::assertCount(1, $sut->getMembers());
@@ -90,7 +99,7 @@ class TeamTest extends TestCase
         $sut->addTeamlead($user2);
         self::assertCount(2, $sut->getMembers());
         self::assertTrue($sut->isTeamlead($user2));
-        $sut->removeTeamlead($user2);
+        $sut->demoteTeamlead($user2);
         self::assertCount(2, $sut->getMembers());
         self::assertFalse($sut->isTeamlead($user2));
 

tests/phpstan.neon

@@ -6,9 +6,6 @@ includes:
 parameters:
     tmpDir: %rootDir%/../../../var/cache/phpstan
     ignoreErrors:
-        - '#Access to an undefined property Faker\\Generator::\$stateAbbr.#'
-        - '#Access to an undefined property Faker\\Generator::\$catchPhrase.#'
-        - '#Access to an undefined property Faker\\Generator::\$bs.#'
         - '#Call to static method PHPUnit\\Framework\\Assert::assertSame\(\) with App\\Entity\\[a-zA-Z0-9]+ and null will always evaluate to false.#'
     excludes_analyse:
         - %rootDir%/../../../tests/Ldap/LdapDriverTest.php