minor #36244 [Typo] Rename occurence to occurrence (pgrimaud)

xabbuh · xabbuh · commit eb0e47b40c65 · 2020-03-28T08:34:32.000+01:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [Typo] Rename occurence to occurrence | Q | A | ------------- | --- | Branch? | master (5.1) | Bug fix? | yes (typo) | New feature? | no | Deprecations? | no | Tickets | Fix #36242 | License | MIT | Doc PR | Not needed This PR will fix correct spelling of methods containing the word occurrence implemented with PR : - [PHPUnitBridge] Improved deprecations display #35271 This changes are on master branch, because the original PR is a new feature for Symfony 5.1. Commits ------- 11f746a [Typo] Rename occurence to occurrence
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/DeprecationGroup.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/DeprecationGroup.php
@@ -30,7 +30,7 @@ final class DeprecationGroup
      */
     public function addNoticeFromObject($message, $class, $method)
     {
-        $this->deprecationNotice($message)->addObjectOccurence($class, $method);
+        $this->deprecationNotice($message)->addObjectOccurrence($class, $method);
         $this->addNotice();
     }
 
@@ -39,7 +39,7 @@ public function addNoticeFromObject($message, $class, $method)
      */
     public function addNoticeFromProceduralCode($message)
     {
-        $this->deprecationNotice($message)->addProceduralOccurence();
+        $this->deprecationNotice($message)->addProceduralOccurrence();
         $this->addNotice();
     }
 
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/DeprecationNotice.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/DeprecationNotice.php
@@ -23,7 +23,7 @@ final class DeprecationNotice
      */
     private $countsByCaller = [];
 
-    public function addObjectOccurence($class, $method)
+    public function addObjectOccurrence($class, $method)
     {
         if (!isset($this->countsByCaller["$class::$method"])) {
             $this->countsByCaller["$class::$method"] = 0;
@@ -32,7 +32,7 @@ public function addObjectOccurence($class, $method)
         ++$this->count;
     }
 
-    public function addProceduralOccurence()
+    public function addProceduralOccurrence()
     {
         ++$this->count;
     }
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationNoticeTest.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/DeprecationNoticeTest.php
@@ -10,9 +10,9 @@ final class DeprecationNoticeTest extends TestCase
     public function testItGroupsByCaller()
     {
         $notice = new DeprecationNotice();
-        $notice->addObjectOccurence('MyAction', '__invoke');
-        $notice->addObjectOccurence('MyAction', '__invoke');
-        $notice->addObjectOccurence('MyOtherAction', '__invoke');
+        $notice->addObjectOccurrence('MyAction', '__invoke');
+        $notice->addObjectOccurrence('MyAction', '__invoke');
+        $notice->addObjectOccurrence('MyOtherAction', '__invoke');
 
         $countsByCaller = $notice->getCountsByCaller();
 
@@ -23,13 +23,13 @@ public function testItGroupsByCaller()
         $this->assertSame(1, $countsByCaller['MyOtherAction::__invoke']);
     }
 
-    public function testItCountsBothTypesOfOccurences()
+    public function testItCountsBothTypesOfOccurrences()
     {
         $notice = new DeprecationNotice();
-        $notice->addObjectOccurence('MyAction', '__invoke');
+        $notice->addObjectOccurrence('MyAction', '__invoke');
         $this->assertSame(1, $notice->count());
 
-        $notice->addProceduralOccurence();
+        $notice->addProceduralOccurrence();
         $this->assertSame(2, $notice->count());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ final class DeprecationGroup`
`30`	`30`	`*/`
`31`	`31`	`public function addNoticeFromObject($message, $class, $method)`
`32`	`32`	`{`
`33`		`- $this->deprecationNotice($message)->addObjectOccurence($class, $method);`
	`33`	`+ $this->deprecationNotice($message)->addObjectOccurrence($class, $method);`
`34`	`34`	`$this->addNotice();`
`35`	`35`	`}`
`36`	`36`
`@@ -39,7 +39,7 @@ public function addNoticeFromObject($message, $class, $method)`
`39`	`39`	`*/`
`40`	`40`	`public function addNoticeFromProceduralCode($message)`
`41`	`41`	`{`
`42`		`- $this->deprecationNotice($message)->addProceduralOccurence();`
	`42`	`+ $this->deprecationNotice($message)->addProceduralOccurrence();`
`43`	`43`	`$this->addNotice();`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ final class DeprecationNotice`
`23`	`23`	`*/`
`24`	`24`	`private $countsByCaller = [];`
`25`	`25`
`26`		`- public function addObjectOccurence($class, $method)`
	`26`	`+ public function addObjectOccurrence($class, $method)`
`27`	`27`	`{`
`28`	`28`	`if (!isset($this->countsByCaller["$class::$method"])) {`
`29`	`29`	`$this->countsByCaller["$class::$method"] = 0;`
`@@ -32,7 +32,7 @@ public function addObjectOccurence($class, $method)`
`32`	`32`	`++$this->count;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function addProceduralOccurence()`
	`35`	`+ public function addProceduralOccurrence()`
`36`	`36`	`{`
`37`	`37`	`++$this->count;`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ final class DeprecationNoticeTest extends TestCase`
`10`	`10`	`public function testItGroupsByCaller()`
`11`	`11`	`{`
`12`	`12`	`$notice = new DeprecationNotice();`
`13`		`- $notice->addObjectOccurence('MyAction', '__invoke');`
`14`		`- $notice->addObjectOccurence('MyAction', '__invoke');`
`15`		`- $notice->addObjectOccurence('MyOtherAction', '__invoke');`
	`13`	`+ $notice->addObjectOccurrence('MyAction', '__invoke');`
	`14`	`+ $notice->addObjectOccurrence('MyAction', '__invoke');`
	`15`	`+ $notice->addObjectOccurrence('MyOtherAction', '__invoke');`
`16`	`16`
`17`	`17`	`$countsByCaller = $notice->getCountsByCaller();`
`18`	`18`
`@@ -23,13 +23,13 @@ public function testItGroupsByCaller()`
`23`	`23`	`$this->assertSame(1, $countsByCaller['MyOtherAction::__invoke']);`
`24`	`24`	`}`
`25`	`25`
`26`		`- public function testItCountsBothTypesOfOccurences()`
	`26`	`+ public function testItCountsBothTypesOfOccurrences()`
`27`	`27`	`{`
`28`	`28`	`$notice = new DeprecationNotice();`
`29`		`- $notice->addObjectOccurence('MyAction', '__invoke');`
	`29`	`+ $notice->addObjectOccurrence('MyAction', '__invoke');`
`30`	`30`	`$this->assertSame(1, $notice->count());`
`31`	`31`
`32`		`- $notice->addProceduralOccurence();`
	`32`	`+ $notice->addProceduralOccurrence();`
`33`	`33`	`$this->assertSame(2, $notice->count());`
`34`	`34`	`}`
`35`	`35`	`}`