@@ -786,7 +786,11 @@ |
||
786 | 786 | foreach ($last25queries as $i => $query) { |
787 | 787 | $params = array_map( |
788 | 788 | function($p) { |
789 | - if (is_object($p)) return get_class($p); else return var_export($p, true); |
|
789 | + if (is_object($p)) { |
|
790 | + return get_class($p); |
|
791 | + } else { |
|
792 | + return var_export($p, true); |
|
793 | + } |
|
790 | 794 | }, |
791 | 795 | $query['params'] ?: [] |
792 | 796 | ); |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types=1); |
|
3 | +declare(strict_types = 1); |
|
4 | 4 | |
5 | 5 | namespace Doctrine\Tests; |
6 | 6 | |
@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | $conn->executeUpdate('DELETE FROM RoutingLocation'); |
404 | 404 | } |
405 | 405 | |
406 | - if(isset($this->usedModelSets['navigation'])) { |
|
406 | + if (isset($this->usedModelSets['navigation'])) { |
|
407 | 407 | $conn->executeUpdate('DELETE FROM navigation_tour_pois'); |
408 | 408 | $conn->executeUpdate('DELETE FROM navigation_photos'); |
409 | 409 | $conn->executeUpdate('DELETE FROM navigation_pois'); |
@@ -412,7 +412,7 @@ discard block |
||
412 | 412 | } |
413 | 413 | |
414 | 414 | if (isset($this->usedModelSets['directorytree'])) { |
415 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("file")); |
|
415 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("file")); |
|
416 | 416 | // MySQL doesn't know deferred deletions therefore only executing the second query gives errors. |
417 | 417 | $conn->executeUpdate('DELETE FROM Directory WHERE parentDirectory_id IS NOT NULL'); |
418 | 418 | $conn->executeUpdate('DELETE FROM Directory'); |
@@ -505,12 +505,12 @@ discard block |
||
505 | 505 | ) |
506 | 506 | ); |
507 | 507 | |
508 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups')); |
|
509 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-group")); |
|
510 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-phone")); |
|
511 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-user")); |
|
512 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-address")); |
|
513 | - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city')); |
|
508 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-users-groups')); |
|
509 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-group")); |
|
510 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-phone")); |
|
511 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-user")); |
|
512 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier("quote-address")); |
|
513 | + $conn->executeUpdate('DELETE FROM '.$platform->quoteIdentifier('quote-city')); |
|
514 | 514 | } |
515 | 515 | |
516 | 516 | if (isset($this->usedModelSets['vct_onetoone'])) { |
@@ -645,15 +645,15 @@ discard block |
||
645 | 645 | { |
646 | 646 | $this->setUpDBALTypes(); |
647 | 647 | |
648 | - if (! isset(static::$sharedConn)) { |
|
648 | + if ( ! isset(static::$sharedConn)) { |
|
649 | 649 | static::$sharedConn = TestUtil::getConnection(); |
650 | 650 | } |
651 | 651 | |
652 | 652 | if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) { |
653 | 653 | if (in_array(static::$sharedConn->getDatabasePlatform()->getName(), ["mysql", "postgresql"])) { |
654 | - static::$sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/'); |
|
654 | + static::$sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/'); |
|
655 | 655 | } elseif (static::$sharedConn->getDatabasePlatform()->getName() === "oracle") { |
656 | - static::$sharedConn->executeQuery('SELECT 1 /*' . get_class($this) . '*/ FROM dual'); |
|
656 | + static::$sharedConn->executeQuery('SELECT 1 /*'.get_class($this).'*/ FROM dual'); |
|
657 | 657 | } |
658 | 658 | } |
659 | 659 | |
@@ -663,7 +663,7 @@ discard block |
||
663 | 663 | } |
664 | 664 | |
665 | 665 | foreach ($this->usedModelSets as $setName => $bool) { |
666 | - if (! isset(static::$tablesCreated[$setName])) { |
|
666 | + if ( ! isset(static::$tablesCreated[$setName])) { |
|
667 | 667 | $this->setUpEntitySchema(static::$modelSets[$setName]); |
668 | 668 | |
669 | 669 | static::$tablesCreated[$setName] = true; |
@@ -738,8 +738,8 @@ discard block |
||
738 | 738 | |
739 | 739 | $config->setMetadataDriverImpl( |
740 | 740 | $mappingDriver ?? $config->newDefaultAnnotationDriver([ |
741 | - realpath(__DIR__ . '/Models/Cache'), |
|
742 | - realpath(__DIR__ . '/Models/GeoNames') |
|
741 | + realpath(__DIR__.'/Models/Cache'), |
|
742 | + realpath(__DIR__.'/Models/GeoNames') |
|
743 | 743 | ]) |
744 | 744 | ); |
745 | 745 | |
@@ -803,9 +803,9 @@ discard block |
||
803 | 803 | $trace = $e->getTrace(); |
804 | 804 | $traceMsg = ""; |
805 | 805 | |
806 | - foreach($trace as $part) { |
|
807 | - if(isset($part['file'])) { |
|
808 | - if(strpos($part['file'], "PHPUnit/") !== false) { |
|
806 | + foreach ($trace as $part) { |
|
807 | + if (isset($part['file'])) { |
|
808 | + if (strpos($part['file'], "PHPUnit/") !== false) { |
|
809 | 809 | // Beginning with PHPUnit files we don't print the trace anymore. |
810 | 810 | break; |
811 | 811 | } |
@@ -816,7 +816,7 @@ discard block |
||
816 | 816 | |
817 | 817 | $message = "[".get_class($e)."] ".$e->getMessage().PHP_EOL.PHP_EOL."With queries:".PHP_EOL.$queries.PHP_EOL."Trace:".PHP_EOL.$traceMsg; |
818 | 818 | |
819 | - throw new \Exception($message, (int)$e->getCode(), $e); |
|
819 | + throw new \Exception($message, (int) $e->getCode(), $e); |
|
820 | 820 | } |
821 | 821 | |
822 | 822 | throw $e; |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types=1); |
|
3 | +declare(strict_types = 1); |
|
4 | 4 | |
5 | 5 | namespace Doctrine\Tests\ORM; |
6 | 6 |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types=1); |
|
3 | +declare(strict_types = 1); |
|
4 | 4 | |
5 | 5 | namespace Doctrine\Tests\ORM\Utility; |
6 | 6 |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types=1); |
|
3 | +declare(strict_types = 1); |
|
4 | 4 | |
5 | 5 | namespace Doctrine\Tests\ORM\Mapping; |
6 | 6 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types=1); |
|
3 | +declare(strict_types = 1); |
|
4 | 4 | |
5 | 5 | namespace Doctrine\Tests\ORM\Mapping; |
6 | 6 | |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | { |
21 | 21 | protected function loadDriver() |
22 | 22 | { |
23 | - return new XmlDriver(__DIR__ . DIRECTORY_SEPARATOR . 'xml'); |
|
23 | + return new XmlDriver(__DIR__.DIRECTORY_SEPARATOR.'xml'); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public function testClassTableInheritanceDiscriminatorMap() |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | */ |
163 | 163 | public function testValidateXmlSchema($xmlMappingFile) |
164 | 164 | { |
165 | - $xsdSchemaFile = __DIR__ . '/../../../../../doctrine-mapping.xsd'; |
|
165 | + $xsdSchemaFile = __DIR__.'/../../../../../doctrine-mapping.xsd'; |
|
166 | 166 | $dom = new \DOMDocument('UTF-8'); |
167 | 167 | |
168 | 168 | $dom->load($xmlMappingFile); |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | |
173 | 173 | static public function dataValidSchema() |
174 | 174 | { |
175 | - $list = glob(__DIR__ . '/xml/*.xml'); |
|
175 | + $list = glob(__DIR__.'/xml/*.xml'); |
|
176 | 176 | $invalid = [ |
177 | 177 | 'Doctrine.Tests.Models.DDC889.DDC889Class.dcm' |
178 | 178 | ]; |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | return ! in_array(pathinfo($item, PATHINFO_FILENAME), $invalid); |
182 | 182 | }); |
183 | 183 | |
184 | - return array_map(function($item){ |
|
184 | + return array_map(function($item) { |
|
185 | 185 | return [$item]; |
186 | 186 | }, $list); |
187 | 187 | } |
@@ -1241,7 +1241,7 @@ |
||
1241 | 1241 | $association->setCascade(['invalid']); |
1242 | 1242 | |
1243 | 1243 | $cm->addProperty($association); |
1244 | - } |
|
1244 | + } |
|
1245 | 1245 | |
1246 | 1246 | /** |
1247 | 1247 | * @group DDC-964 |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types=1); |
|
3 | +declare(strict_types = 1); |
|
4 | 4 | |
5 | 5 | namespace Doctrine\Tests\ORM\Mapping; |
6 | 6 | |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | use Doctrine\Tests\OrmTestCase; |
31 | 31 | use DoctrineGlobal_Article; |
32 | 32 | |
33 | -require_once __DIR__ . '/../../Models/Global/GlobalNamespaceModel.php'; |
|
33 | +require_once __DIR__.'/../../Models/Global/GlobalNamespaceModel.php'; |
|
34 | 34 | |
35 | 35 | class ClassMetadataTest extends OrmTestCase |
36 | 36 | { |
@@ -803,7 +803,7 @@ discard block |
||
803 | 803 | public function testEmptyFieldNameThrowsException() |
804 | 804 | { |
805 | 805 | $this->expectException(MappingException::class); |
806 | - $this->expectExceptionMessage("The field or association mapping misses the 'fieldName' attribute in entity '" . CMS\CmsUser::class . "'."); |
|
806 | + $this->expectExceptionMessage("The field or association mapping misses the 'fieldName' attribute in entity '".CMS\CmsUser::class."'."); |
|
807 | 807 | |
808 | 808 | $cm = new ClassMetadata(CMS\CmsUser::class, $this->metadataBuildingContext); |
809 | 809 | $cm->setTable(new Mapping\TableMetadata('cms_users')); |
@@ -946,12 +946,12 @@ discard block |
||
946 | 946 | $mapping = $cm->getSqlResultSetMapping('find-all'); |
947 | 947 | |
948 | 948 | self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']); |
949 | - self::assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]); |
|
950 | - self::assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]); |
|
949 | + self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]); |
|
950 | + self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]); |
|
951 | 951 | |
952 | 952 | self::assertEquals(CMS\CmsEmail::class, $mapping['entities'][1]['entityClass']); |
953 | - self::assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][1]['fields'][0]); |
|
954 | - self::assertEquals(['name'=>'email','column'=>'email'], $mapping['entities'][1]['fields'][1]); |
|
953 | + self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][1]['fields'][0]); |
|
954 | + self::assertEquals(['name'=>'email', 'column'=>'email'], $mapping['entities'][1]['fields'][1]); |
|
955 | 955 | |
956 | 956 | self::assertEquals('scalarColumn', $mapping['columns'][0]['name']); |
957 | 957 | } |
@@ -1148,7 +1148,7 @@ discard block |
||
1148 | 1148 | $cm->addLifecycleCallback('notfound', 'postLoad'); |
1149 | 1149 | |
1150 | 1150 | $this->expectException(MappingException::class); |
1151 | - $this->expectExceptionMessage("Entity '" . CMS\CmsUser::class . "' has no method 'notfound' to be registered as lifecycle callback."); |
|
1151 | + $this->expectExceptionMessage("Entity '".CMS\CmsUser::class."' has no method 'notfound' to be registered as lifecycle callback."); |
|
1152 | 1152 | |
1153 | 1153 | $cm->validateLifecycleCallbacks(new RuntimeReflectionService()); |
1154 | 1154 | } |
@@ -1168,7 +1168,7 @@ discard block |
||
1168 | 1168 | $cm->addProperty($association); |
1169 | 1169 | |
1170 | 1170 | $this->expectException(MappingException::class); |
1171 | - $this->expectExceptionMessage("The target-entity 'UnknownClass' cannot be found in '" . CMS\CmsUser::class . "#address'."); |
|
1171 | + $this->expectExceptionMessage("The target-entity 'UnknownClass' cannot be found in '".CMS\CmsUser::class."#address'."); |
|
1172 | 1172 | |
1173 | 1173 | $cm->validateAssociations(); |
1174 | 1174 | } |
@@ -1509,6 +1509,6 @@ discard block |
||
1509 | 1509 | */ |
1510 | 1510 | public function propertyToColumnName($propertyName, $className = null) |
1511 | 1511 | { |
1512 | - return strtolower($this->classToTableName($className)) . '_' . $propertyName; |
|
1512 | + return strtolower($this->classToTableName($className)).'_'.$propertyName; |
|
1513 | 1513 | } |
1514 | 1514 | } |
@@ -811,7 +811,7 @@ |
||
811 | 811 | self::assertEquals($guestGroups->getFetchMode(), $adminGroups->getFetchMode()); |
812 | 812 | self::assertEquals($guestGroups->getCascade(), $adminGroups->getCascade()); |
813 | 813 | |
814 | - // assert not override attributes |
|
814 | + // assert not override attributes |
|
815 | 815 | $guestGroupsJoinTable = $guestGroups->getJoinTable(); |
816 | 816 | $guestGroupsJoinColumns = $guestGroupsJoinTable->getJoinColumns(); |
817 | 817 | $guestGroupsJoinColumn = reset($guestGroupsJoinColumns); |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types=1); |
|
3 | +declare(strict_types = 1); |
|
4 | 4 | |
5 | 5 | namespace Doctrine\Tests\ORM\Mapping; |
6 | 6 | |
@@ -683,13 +683,13 @@ discard block |
||
683 | 683 | |
684 | 684 | $findByIdQuery = $class->getNamedNativeQuery('find-by-id'); |
685 | 685 | |
686 | - self::assertEquals(CmsAddress::class,$findByIdQuery['resultClass']); |
|
687 | - self::assertEquals('SELECT * FROM cms_addresses WHERE id = ?', $findByIdQuery['query']); |
|
686 | + self::assertEquals(CmsAddress::class, $findByIdQuery['resultClass']); |
|
687 | + self::assertEquals('SELECT * FROM cms_addresses WHERE id = ?', $findByIdQuery['query']); |
|
688 | 688 | |
689 | 689 | $countQuery = $class->getNamedNativeQuery('count'); |
690 | 690 | |
691 | 691 | self::assertEquals('mapping-count', $countQuery['resultSetMapping']); |
692 | - self::assertEquals('SELECT COUNT(*) AS count FROM cms_addresses', $countQuery['query']); |
|
692 | + self::assertEquals('SELECT COUNT(*) AS count FROM cms_addresses', $countQuery['query']); |
|
693 | 693 | |
694 | 694 | // result set mapping |
695 | 695 | self::assertCount(3, $class->sqlResultSetMappings); |
@@ -700,9 +700,9 @@ discard block |
||
700 | 700 | $findAllMapping = $class->getSqlResultSetMapping('mapping-find-all'); |
701 | 701 | |
702 | 702 | self::assertEquals(CmsAddress::class, $findAllMapping['entities'][0]['entityClass']); |
703 | - self::assertEquals(['name'=>'id','column'=>'id'], $findAllMapping['entities'][0]['fields'][0]); |
|
704 | - self::assertEquals(['name'=>'city','column'=>'city'], $findAllMapping['entities'][0]['fields'][1]); |
|
705 | - self::assertEquals(['name'=>'country','column'=>'country'], $findAllMapping['entities'][0]['fields'][2]); |
|
703 | + self::assertEquals(['name'=>'id', 'column'=>'id'], $findAllMapping['entities'][0]['fields'][0]); |
|
704 | + self::assertEquals(['name'=>'city', 'column'=>'city'], $findAllMapping['entities'][0]['fields'][1]); |
|
705 | + self::assertEquals(['name'=>'country', 'column'=>'country'], $findAllMapping['entities'][0]['fields'][2]); |
|
706 | 706 | |
707 | 707 | $withoutFieldsMapping = $class->getSqlResultSetMapping('mapping-without-fields'); |
708 | 708 | |
@@ -728,63 +728,63 @@ discard block |
||
728 | 728 | |
729 | 729 | $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedAddress'); |
730 | 730 | |
731 | - self::assertEquals([],$mapping['columns']); |
|
731 | + self::assertEquals([], $mapping['columns']); |
|
732 | 732 | self::assertEquals('mappingJoinedAddress', $mapping['name']); |
733 | 733 | |
734 | 734 | self::assertNull($mapping['entities'][0]['discriminatorColumn']); |
735 | 735 | |
736 | - self::assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]); |
|
737 | - self::assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]); |
|
738 | - self::assertEquals(['name'=>'status','column'=>'status'], $mapping['entities'][0]['fields'][2]); |
|
739 | - self::assertEquals(['name'=>'address.zip','column'=>'zip'], $mapping['entities'][0]['fields'][3]); |
|
740 | - self::assertEquals(['name'=>'address.city','column'=>'city'], $mapping['entities'][0]['fields'][4]); |
|
741 | - self::assertEquals(['name'=>'address.country','column'=>'country'], $mapping['entities'][0]['fields'][5]); |
|
742 | - self::assertEquals(['name'=>'address.id','column'=>'a_id'], $mapping['entities'][0]['fields'][6]); |
|
743 | - self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']); |
|
736 | + self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]); |
|
737 | + self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]); |
|
738 | + self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]); |
|
739 | + self::assertEquals(['name'=>'address.zip', 'column'=>'zip'], $mapping['entities'][0]['fields'][3]); |
|
740 | + self::assertEquals(['name'=>'address.city', 'column'=>'city'], $mapping['entities'][0]['fields'][4]); |
|
741 | + self::assertEquals(['name'=>'address.country', 'column'=>'country'], $mapping['entities'][0]['fields'][5]); |
|
742 | + self::assertEquals(['name'=>'address.id', 'column'=>'a_id'], $mapping['entities'][0]['fields'][6]); |
|
743 | + self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']); |
|
744 | 744 | |
745 | 745 | $mapping = $userMetadata->getSqlResultSetMapping('mappingJoinedPhonenumber'); |
746 | 746 | |
747 | - self::assertEquals([],$mapping['columns']); |
|
747 | + self::assertEquals([], $mapping['columns']); |
|
748 | 748 | self::assertEquals('mappingJoinedPhonenumber', $mapping['name']); |
749 | 749 | |
750 | 750 | self::assertNull($mapping['entities'][0]['discriminatorColumn']); |
751 | 751 | |
752 | - self::assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]); |
|
753 | - self::assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]); |
|
754 | - self::assertEquals(['name'=>'status','column'=>'status'], $mapping['entities'][0]['fields'][2]); |
|
755 | - self::assertEquals(['name'=>'phonenumbers.phonenumber','column'=>'number'], $mapping['entities'][0]['fields'][3]); |
|
756 | - self::assertEquals($userMetadata->getClassName(), $mapping['entities'][0]['entityClass']); |
|
752 | + self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]); |
|
753 | + self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]); |
|
754 | + self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]); |
|
755 | + self::assertEquals(['name'=>'phonenumbers.phonenumber', 'column'=>'number'], $mapping['entities'][0]['fields'][3]); |
|
756 | + self::assertEquals($userMetadata->getClassName(), $mapping['entities'][0]['entityClass']); |
|
757 | 757 | |
758 | 758 | $mapping = $userMetadata->getSqlResultSetMapping('mappingUserPhonenumberCount'); |
759 | 759 | |
760 | - self::assertEquals(['name'=>'numphones'],$mapping['columns'][0]); |
|
760 | + self::assertEquals(['name'=>'numphones'], $mapping['columns'][0]); |
|
761 | 761 | self::assertEquals('mappingUserPhonenumberCount', $mapping['name']); |
762 | 762 | |
763 | 763 | self::assertNull($mapping['entities'][0]['discriminatorColumn']); |
764 | 764 | |
765 | - self::assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]); |
|
766 | - self::assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]); |
|
767 | - self::assertEquals(['name'=>'status','column'=>'status'], $mapping['entities'][0]['fields'][2]); |
|
768 | - self::assertEquals($userMetadata->getClassName(), $mapping['entities'][0]['entityClass']); |
|
765 | + self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]); |
|
766 | + self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]); |
|
767 | + self::assertEquals(['name'=>'status', 'column'=>'status'], $mapping['entities'][0]['fields'][2]); |
|
768 | + self::assertEquals($userMetadata->getClassName(), $mapping['entities'][0]['entityClass']); |
|
769 | 769 | |
770 | 770 | $mapping = $userMetadata->getSqlResultSetMapping('mappingMultipleJoinsEntityResults'); |
771 | 771 | |
772 | - self::assertEquals(['name'=>'numphones'],$mapping['columns'][0]); |
|
772 | + self::assertEquals(['name'=>'numphones'], $mapping['columns'][0]); |
|
773 | 773 | self::assertEquals('mappingMultipleJoinsEntityResults', $mapping['name']); |
774 | 774 | |
775 | 775 | self::assertNull($mapping['entities'][0]['discriminatorColumn']); |
776 | 776 | |
777 | - self::assertEquals(['name'=>'id','column'=>'u_id'], $mapping['entities'][0]['fields'][0]); |
|
778 | - self::assertEquals(['name'=>'name','column'=>'u_name'], $mapping['entities'][0]['fields'][1]); |
|
779 | - self::assertEquals(['name'=>'status','column'=>'u_status'], $mapping['entities'][0]['fields'][2]); |
|
780 | - self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']); |
|
777 | + self::assertEquals(['name'=>'id', 'column'=>'u_id'], $mapping['entities'][0]['fields'][0]); |
|
778 | + self::assertEquals(['name'=>'name', 'column'=>'u_name'], $mapping['entities'][0]['fields'][1]); |
|
779 | + self::assertEquals(['name'=>'status', 'column'=>'u_status'], $mapping['entities'][0]['fields'][2]); |
|
780 | + self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']); |
|
781 | 781 | |
782 | 782 | self::assertNull($mapping['entities'][1]['discriminatorColumn']); |
783 | 783 | |
784 | - self::assertEquals(['name'=>'id','column'=>'a_id'], $mapping['entities'][1]['fields'][0]); |
|
785 | - self::assertEquals(['name'=>'zip','column'=>'a_zip'], $mapping['entities'][1]['fields'][1]); |
|
786 | - self::assertEquals(['name'=>'country','column'=>'a_country'], $mapping['entities'][1]['fields'][2]); |
|
787 | - self::assertEquals(CmsAddress::class, $mapping['entities'][1]['entityClass']); |
|
784 | + self::assertEquals(['name'=>'id', 'column'=>'a_id'], $mapping['entities'][1]['fields'][0]); |
|
785 | + self::assertEquals(['name'=>'zip', 'column'=>'a_zip'], $mapping['entities'][1]['fields'][1]); |
|
786 | + self::assertEquals(['name'=>'country', 'column'=>'a_country'], $mapping['entities'][1]['fields'][2]); |
|
787 | + self::assertEquals(CmsAddress::class, $mapping['entities'][1]['entityClass']); |
|
788 | 788 | |
789 | 789 | //person asserts |
790 | 790 | self::assertCount(1, $personMetadata->getSqlResultSetMappings()); |
@@ -796,9 +796,9 @@ discard block |
||
796 | 796 | |
797 | 797 | self::assertEquals('discriminator', $mapping['entities'][0]['discriminatorColumn']); |
798 | 798 | |
799 | - self::assertEquals(['name'=>'id','column'=>'id'], $mapping['entities'][0]['fields'][0]); |
|
800 | - self::assertEquals(['name'=>'name','column'=>'name'], $mapping['entities'][0]['fields'][1]); |
|
801 | - self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']); |
|
799 | + self::assertEquals(['name'=>'id', 'column'=>'id'], $mapping['entities'][0]['fields'][0]); |
|
800 | + self::assertEquals(['name'=>'name', 'column'=>'name'], $mapping['entities'][0]['fields'][1]); |
|
801 | + self::assertEquals('__CLASS__', $mapping['entities'][0]['entityClass']); |
|
802 | 802 | } |
803 | 803 | |
804 | 804 | /* |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types=1); |
|
3 | +declare(strict_types = 1); |
|
4 | 4 | |
5 | 5 | namespace Doctrine\Tests\ORM\Mapping; |
6 | 6 | |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | protected function setUp() |
22 | 22 | { |
23 | 23 | parent::setUp(); |
24 | - $this->resolver = new DefaultEntityListenerResolver(); |
|
24 | + $this->resolver = new DefaultEntityListenerResolver(); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | public function testResolve() |
@@ -1,6 +1,6 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | -declare(strict_types=1); |
|
3 | +declare(strict_types = 1); |
|
4 | 4 | |
5 | 5 | namespace Doctrine\Tests\ORM\Mapping\NamingStrategy; |
6 | 6 | |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | public function joinColumnName($propertyName, $className = null) |
18 | 18 | { |
19 | 19 | return strtolower($this->classToTableName($className)) |
20 | - . '_' . $propertyName |
|
21 | - . '_' . $this->referenceColumnName(); |
|
20 | + . '_'.$propertyName |
|
21 | + . '_'.$this->referenceColumnName(); |
|
22 | 22 | } |
23 | 23 | } |