Merge branch '4.3' into 4.4

chalasr · chalasr · commit 662b35e30e2b · 2019-10-29T04:34:23.000+01:00
* 4.3:
  remove outdated workflow test
  drop wrong test (fix merge)
diff --git a/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php b/src/Symfony/Component/ExpressionLanguage/Tests/ExpressionLanguageTest.php
@@ -63,14 +63,6 @@ public function testCachedParse()
         $this->assertSame($savedParsedExpression, $parsedExpression);
     }
 
-    public function testWrongCacheImplementation()
-    {
-        $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessage('Cache argument has to implement Psr\Cache\CacheItemPoolInterface.');
-        $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemSpoolInterface')->getMock();
-        new ExpressionLanguage($cacheMock);
-    }
-
     public function testConstantFunction()
     {
         $expressionLanguage = new ExpressionLanguage();
diff --git a/src/Symfony/Component/Workflow/Tests/TransitionTest.php b/src/Symfony/Component/Workflow/Tests/TransitionTest.php
@@ -7,13 +7,6 @@
 
 class TransitionTest extends TestCase
 {
-    public function testValidateName()
-    {
-        $this->expectException('Symfony\Component\Workflow\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('The transition "foo.bar" contains invalid characters.');
-        new Transition('foo.bar', 'a', 'b');
-    }
-
     public function testConstructor()
     {
         $transition = new Transition('name', 'a', 'b');

Original file line number	Diff line number	Diff line change
`@@ -63,14 +63,6 @@ public function testCachedParse()`
`63`	`63`	`$this->assertSame($savedParsedExpression, $parsedExpression);`
`64`	`64`	`}`
`65`	`65`
`66`		`- public function testWrongCacheImplementation()`
`67`		`- {`
`68`		`- $this->expectException('InvalidArgumentException');`
`69`		`- $this->expectExceptionMessage('Cache argument has to implement Psr\Cache\CacheItemPoolInterface.');`
`70`		`- $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemSpoolInterface')->getMock();`
`71`		`- new ExpressionLanguage($cacheMock);`
`72`		`- }`
`73`		`-`
`74`	`66`	`public function testConstantFunction()`
`75`	`67`	`{`
`76`	`68`	`$expressionLanguage = new ExpressionLanguage();`
Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,6 @@`
`7`	`7`
`8`	`8`	`class TransitionTest extends TestCase`
`9`	`9`	`{`
`10`		`- public function testValidateName()`
`11`		`- {`
`12`		`- $this->expectException('Symfony\Component\Workflow\Exception\InvalidArgumentException');`
`13`		`- $this->expectExceptionMessage('The transition "foo.bar" contains invalid characters.');`
`14`		`- new Transition('foo.bar', 'a', 'b');`
`15`		`- }`
`16`		`-`
`17`	`10`	`public function testConstructor()`
`18`	`11`	`{`
`19`	`12`	`$transition = new Transition('name', 'a', 'b');`