Completed
Pull Request — master (#122)
by Christopher
13:42 queued 08:32
created
tests/MetadataManagerTest.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
     {
38 38
         $ds = DIRECTORY_SEPARATOR;
39 39
 
40
-        $goodxsd = dirname(__DIR__) . $ds . 'xsd' . $ds . 'Microsoft.Data.Entity.Design.Edmx_3.Fixed.xsd';
40
+        $goodxsd = dirname(__DIR__).$ds.'xsd'.$ds.'Microsoft.Data.Entity.Design.Edmx_3.Fixed.xsd';
41 41
         if (!file_exists($goodxsd)) {
42 42
             return true;
43 43
         }
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
         $result = null;
53 53
 
54 54
         list($eType, $result) = $metadataManager->addEntityType('Category');
55
-        $this->assertNotFalse($eType, 'Etype is false not type ' . $metadataManager->getLastError());
55
+        $this->assertNotFalse($eType, 'Etype is false not type '.$metadataManager->getLastError());
56 56
         $metadataManager->addPropertyToEntityType($eType, 'CategoryID', 'Int32', null, false, true, 'Identity');
57 57
         $metadataManager->addPropertyToEntityType($eType, 'CategoryName', 'String');
58 58
         $metadataManager->addPropertyToEntityType($eType, 'Description', 'String');
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         $result = null;
80 80
 
81 81
         list($CategoryType, $result) = $metadataManager->addEntityType('Category');
82
-        $this->assertNotFalse($CategoryType, 'Etype is false not type ' . $metadataManager->getLastError());
82
+        $this->assertNotFalse($CategoryType, 'Etype is false not type '.$metadataManager->getLastError());
83 83
         $metadataManager->addPropertyToEntityType($CategoryType, 'CategoryID', 'Int32', null, false, true, 'Identity');
84 84
         $metadataManager->addPropertyToEntityType($CategoryType, 'CategoryName', 'String');
85 85
         $metadataManager->addPropertyToEntityType($CategoryType, 'Description', 'String');
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
         $this->assertTrue($metadataManager->getEdmx()->isOK($msg), $msg);
166 166
 
167 167
         $expectedRelation = 'Data.Category_Products_Product_Category';
168
-        list($principalNav, ) = $metadataManager->addNavigationPropertyToEntityType(
168
+        list($principalNav,) = $metadataManager->addNavigationPropertyToEntityType(
169 169
             $CategoryType, '*', 'Products', $ProductType, '1', 'Category', ['CategoryID'], ['CategoryID']
170 170
         );
171 171
         $this->assertEquals($expectedRelation, $principalNav->getRelationship());
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
550 550
     {
551 551
         list(, $metadataManager, $CategoryType, $CustomerType) = $this->setUpMetadataForNavTests();
552 552
 
553
-        $expected =  'Invalid multiplicity combination - 1 1';
553
+        $expected = 'Invalid multiplicity combination - 1 1';
554 554
         $actual = null;
555 555
 
556 556
         try {
@@ -572,7 +572,7 @@  discard block
 block discarded – undo
572 572
     {
573 573
         list(, $metadataManager, $CategoryType, $CustomerType) = $this->setUpMetadataForNavTests();
574 574
 
575
-        $expected =  'Invalid multiplicity combination - * 0..1';
575
+        $expected = 'Invalid multiplicity combination - * 0..1';
576 576
         $actual = null;
577 577
 
578 578
         try {
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
 
593 593
     public function testAddComplexType()
594 594
     {
595
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
595
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
596 596
 
597 597
         $name = 'Name';
598 598
         $accessType = 'Public';
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
         $result = $metadataManager->addComplexType($name, $accessType, $summary, $longDescription);
605 605
 
606 606
         $newCount = count($metadataManager->getEdmx()->getDataServiceType()->getSchema()[0]->getComplexType());
607
-        $this->assertEquals($oldCount+1, $newCount);
607
+        $this->assertEquals($oldCount + 1, $newCount);
608 608
         $this->assertNotNull($result);
609 609
         $this->assertTrue($result instanceof TComplexTypeType, get_class($result));
610 610
         $this->assertNotNull($result->getDocumentation());
@@ -612,7 +612,7 @@  discard block
 block discarded – undo
612 612
 
613 613
     public function testAddComplexTypeWithOnlySummary()
614 614
     {
615
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
615
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
616 616
 
617 617
         $name = 'Name';
618 618
         $accessType = 'Public';
@@ -624,7 +624,7 @@  discard block
 block discarded – undo
624 624
         $result = $metadataManager->addComplexType($name, $accessType, $summary, $longDescription);
625 625
 
626 626
         $newCount = count($metadataManager->getEdmx()->getDataServiceType()->getSchema()[0]->getComplexType());
627
-        $this->assertEquals($oldCount+1, $newCount);
627
+        $this->assertEquals($oldCount + 1, $newCount);
628 628
         $this->assertNotNull($result);
629 629
         $this->assertTrue($result instanceof TComplexTypeType, get_class($result));
630 630
         $this->assertNull($result->getDocumentation());
@@ -632,7 +632,7 @@  discard block
 block discarded – undo
632 632
 
633 633
     public function testAddComplexTypeWithOnlyDescription()
634 634
     {
635
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
635
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
636 636
 
637 637
         $name = 'Name';
638 638
         $accessType = 'Public';
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
644 644
         $result = $metadataManager->addComplexType($name, $accessType, $summary, $longDescription);
645 645
 
646 646
         $newCount = count($metadataManager->getEdmx()->getDataServiceType()->getSchema()[0]->getComplexType());
647
-        $this->assertEquals($oldCount+1, $newCount);
647
+        $this->assertEquals($oldCount + 1, $newCount);
648 648
         $this->assertNotNull($result);
649 649
         $this->assertTrue($result instanceof TComplexTypeType, get_class($result));
650 650
         $this->assertNull($result->getDocumentation());
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
         $expected = 'Default value cannot be object or array';
656 656
         $actual = null;
657 657
 
658
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
658
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
659 659
         $complex = m::mock(TComplexTypeType::class);
660 660
         $name = 'name';
661 661
         $type = 'type';
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
         $expected = 'Default value cannot be object or array';
675 675
         $actual = null;
676 676
 
677
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
677
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
678 678
         $complex = m::mock(TComplexTypeType::class);
679 679
         $name = 'name';
680 680
         $type = 'type';
@@ -690,7 +690,7 @@  discard block
 block discarded – undo
690 690
 
691 691
     public function testAddPropertyToComplexTypeDefaultValueBoolean()
692 692
     {
693
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
693
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
694 694
         $complex = m::mock(TComplexTypeType::class);
695 695
         $complex->shouldReceive('addToProperty')
696 696
             ->with(m::type(TComplexTypePropertyType::class))->andReturnNull()->once();
@@ -716,7 +716,7 @@  discard block
 block discarded – undo
716 716
 
717 717
     public function testAddPropertyToComplexTypeDefaultValueBooleanOnlySummary()
718 718
     {
719
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
719
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
720 720
         $complex = m::mock(TComplexTypeType::class);
721 721
         $complex->shouldReceive('addToProperty')
722 722
             ->with(m::type(TComplexTypePropertyType::class))->andReturnNull()->once();
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
743 743
 
744 744
     public function testAddPropertyToComplexTypeDefaultValueBooleanOnlyDescription()
745 745
     {
746
-        list(, $metadataManager, , ) = $this->setUpMetadataForNavTests();
746
+        list(, $metadataManager,,) = $this->setUpMetadataForNavTests();
747 747
         $complex = m::mock(TComplexTypeType::class);
748 748
         $complex->shouldReceive('addToProperty')
749 749
             ->with(m::type(TComplexTypePropertyType::class))->andReturnNull()->once();
@@ -862,7 +862,7 @@  discard block
 block discarded – undo
862 862
         $longDescription = new TTextType();
863 863
 
864 864
         $metadataManager = new MetadataManager();
865
-        list($result, ) = $metadataManager->addEntityType($name, $accessType, $summary, $longDescription);
865
+        list($result,) = $metadataManager->addEntityType($name, $accessType, $summary, $longDescription);
866 866
         $this->assertNotNull($result->getDocumentation());
867 867
     }
868 868
 
@@ -874,7 +874,7 @@  discard block
 block discarded – undo
874 874
         $longDescription = null;
875 875
 
876 876
         $metadataManager = new MetadataManager();
877
-        list($result, ) = $metadataManager->addEntityType($name, $accessType, $summary, $longDescription);
877
+        list($result,) = $metadataManager->addEntityType($name, $accessType, $summary, $longDescription);
878 878
         $this->assertNull($result->getDocumentation());
879 879
     }
880 880
 
@@ -886,7 +886,7 @@  discard block
 block discarded – undo
886 886
         $longDescription = new TTextType();
887 887
 
888 888
         $metadataManager = new MetadataManager();
889
-        list($result, ) = $metadataManager->addEntityType($name, $accessType, $summary, $longDescription);
889
+        list($result,) = $metadataManager->addEntityType($name, $accessType, $summary, $longDescription);
890 890
         $this->assertNull($result->getDocumentation());
891 891
     }
892 892
 
Please login to merge, or discard this patch.
tests/TSchemaTypeTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
         for ($i = 0; $i < 100; $i++) {
32 32
             $actualMax = max($type->getRand(), $actualMax);
33 33
         }
34
-        $this->assertTrue($expectedMax >= $actualMax, $actualMax . ' must be less than '.$expectedMax);
34
+        $this->assertTrue($expectedMax >= $actualMax, $actualMax.' must be less than '.$expectedMax);
35 35
     }
36 36
 
37 37
     public function testGetRandMinimum()
@@ -42,6 +42,6 @@  discard block
 block discarded – undo
42 42
         for ($i = 0; $i < 100; $i++) {
43 43
             $actualMin = min($type->getRand(), $actualMin);
44 44
         }
45
-        $this->assertTrue($expectedMin <= $actualMin, $actualMin . ' must be less than '.$expectedMin);
45
+        $this->assertTrue($expectedMin <= $actualMin, $actualMin.' must be less than '.$expectedMin);
46 46
     }
47 47
 }
Please login to merge, or discard this patch.
tests/TestTypeTest.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -187,14 +187,14 @@  discard block
 block discarded – undo
187 187
     {
188 188
         $bar = m::mock(testType::class);
189 189
         // closure needs to return true to match the matcher and thus trip the andReturn(false) bit
190
-        $bar->shouldReceive('isOK')->with(m::on(function (&$msg) {
190
+        $bar->shouldReceive('isOK')->with(m::on(function(&$msg) {
191 191
             $msg = 'OH NOES!';
192 192
             return true;
193 193
         }))->andReturn(false);
194 194
 
195 195
         $msg = null;
196 196
         $expected = 'OH NOES!';
197
-        $arr = [ $bar ];
197
+        $arr = [$bar];
198 198
 
199 199
         $foo = new testType();
200 200
         $this->assertFalse($foo->isChildArrayOK($arr, $msg), $msg);
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
         $msg = null;
247 247
         $obj = m::mock(testType::class);
248 248
         // closure needs to return true to match the matcher and thus trip the andReturn(false) bit
249
-        $obj->shouldReceive('isOK')->with(m::on(function (&$msg) {
249
+        $obj->shouldReceive('isOK')->with(m::on(function(&$msg) {
250 250
             $msg = null;
251 251
             return true;
252 252
         }))->andReturn(true);
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
         $msg = null;
260 260
         $obj = m::mock(testType::class);
261 261
         // closure needs to return true to match the matcher and thus trip the andReturn(false) bit
262
-        $obj->shouldReceive('isOK')->with(m::on(function (&$msg) {
262
+        $obj->shouldReceive('isOK')->with(m::on(function(&$msg) {
263 263
             $msg = 'OH NOES!';
264 264
             return true;
265 265
         }))->andReturn(false);
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
     {
286 286
         $foo = m::mock(testType::class)->makePartial();
287 287
         $foo->shouldReceive('isValidArray')->withAnyArgs()->andReturn(true);
288
-        $foo->shouldReceive('isChildArrayOK')->with(m::any(), m::on(function (&$msg) {
288
+        $foo->shouldReceive('isChildArrayOK')->with(m::any(), m::on(function(&$msg) {
289 289
             $msg = 'OH NOES!';
290 290
             return true;
291 291
         }))->andReturn(false);
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
     {
300 300
         $foo = m::mock(testType::class)->makePartial();
301 301
         $foo->shouldReceive('isValidArray')->withAnyArgs()->andReturn(true);
302
-        $foo->shouldReceive('isChildArrayOK')->with(m::any(), m::on(function (&$msg) {
302
+        $foo->shouldReceive('isChildArrayOK')->with(m::any(), m::on(function(&$msg) {
303 303
             $msg = null;
304 304
             return true;
305 305
         }))->andReturn(true);
Please login to merge, or discard this patch.
tests/MetadataManagerNavigationTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
         $result = null;
28 28
 
29 29
         list($CategoryType, $result) = $metadataManager->addEntityType('Category');
30
-        $this->assertNotFalse($CategoryType, 'Etype is false not type ' . $metadataManager->getLastError());
30
+        $this->assertNotFalse($CategoryType, 'Etype is false not type '.$metadataManager->getLastError());
31 31
         $metadataManager->addPropertyToEntityType($CategoryType, 'CategoryID', 'Int32', null, false, true, 'Identity');
32 32
         $metadataManager->addPropertyToEntityType($CategoryType, 'CategoryName', 'String');
33 33
         $metadataManager->addPropertyToEntityType($CategoryType, 'Description', 'String');
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
         $this->assertTrue($metadataManager->getEdmx()->isOK($msg), $msg);
114 114
 
115 115
         $expectedRelation = 'Data.Category_Products_Product_Category';
116
-        list($principalNav, ) = $metadataManager->addNavigationPropertyToEntityType(
116
+        list($principalNav,) = $metadataManager->addNavigationPropertyToEntityType(
117 117
             $CategoryType, '*', 'Products', $ProductType, '1', 'Category', ['CategoryID'], ['CategoryID']
118 118
         );
119 119
         $this->assertEquals($expectedRelation, $principalNav->getRelationship());
Please login to merge, or discard this patch.