update tests

taylorotwell · taylorotwell · commit 2bd35c13678f · 2017-02-15T13:43:51.000-06:00
diff --git a/tests/View/Blade/BladeExpressionTest.php b/tests/View/Blade/BladeExpressionTest.php
@@ -16,15 +16,15 @@ public function tearDown()
     public function testExpressionsOnTheSameLine()
     {
         $compiler = new BladeCompiler($this->getFiles(), __DIR__);
-        $this->assertEquals('<?php echo app(\'translator\')->get(foo(bar(baz(qux(breeze()))))); ?> space () <?php echo app(\'translator\')->get(foo(bar)); ?>', $compiler->compileString('@lang(foo(bar(baz(qux(breeze()))))) space () @lang(foo(bar))'));
+        $this->assertEquals('<?php echo app(\'translator\')->getFromJson(foo(bar(baz(qux(breeze()))))); ?> space () <?php echo app(\'translator\')->getFromJson(foo(bar)); ?>', $compiler->compileString('@lang(foo(bar(baz(qux(breeze()))))) space () @lang(foo(bar))'));
     }
 
     public function testExpressionWithinHTML()
     {
         $compiler = new BladeCompiler($this->getFiles(), __DIR__);
         $this->assertEquals('<html <?php echo e($foo); ?>>', $compiler->compileString('<html {{ $foo }}>'));
         $this->assertEquals('<html<?php echo e($foo); ?>>', $compiler->compileString('<html{{ $foo }}>'));
-        $this->assertEquals('<html <?php echo e($foo); ?> <?php echo app(\'translator\')->get(\'foo\'); ?>>', $compiler->compileString('<html {{ $foo }} @lang(\'foo\')>'));
+        $this->assertEquals('<html <?php echo e($foo); ?> <?php echo app(\'translator\')->getFromJson(\'foo\'); ?>>', $compiler->compileString('<html {{ $foo }} @lang(\'foo\')>'));
     }
 
     protected function getFiles()
diff --git a/tests/View/Blade/BladeLangTest.php b/tests/View/Blade/BladeLangTest.php
@@ -17,14 +17,14 @@ public function testStatementThatContainsNonConsecutiveParanthesisAreCompiled()
     {
         $compiler = new BladeCompiler($this->getFiles(), __DIR__);
         $string = "Foo @lang(function_call('foo(blah)')) bar";
-        $expected = "Foo <?php echo app('translator')->get(function_call('foo(blah)')); ?> bar";
+        $expected = "Foo <?php echo app('translator')->getFromJson(function_call('foo(blah)')); ?> bar";
         $this->assertEquals($expected, $compiler->compileString($string));
     }
 
     public function testLanguageAndChoicesAreCompiled()
     {
         $compiler = new BladeCompiler($this->getFiles(), __DIR__);
-        $this->assertEquals('<?php echo app(\'translator\')->get(\'foo\'); ?>', $compiler->compileString("@lang('foo')"));
+        $this->assertEquals('<?php echo app(\'translator\')->getFromJson(\'foo\'); ?>', $compiler->compileString("@lang('foo')"));
         $this->assertEquals('<?php echo app(\'translator\')->choice(\'foo\', 1); ?>', $compiler->compileString("@choice('foo', 1)"));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,15 @@ public function tearDown()`
`16`	`16`	`public function testExpressionsOnTheSameLine()`
`17`	`17`	`{`
`18`	`18`	`$compiler = new BladeCompiler($this->getFiles(), __DIR__);`
`19`		`- $this->assertEquals('<?php echo app(\'translator\')->get(foo(bar(baz(qux(breeze()))))); ?> space () <?php echo app(\'translator\')->get(foo(bar)); ?>', $compiler->compileString('@lang(foo(bar(baz(qux(breeze()))))) space () @lang(foo(bar))'));`
	`19`	`+ $this->assertEquals('<?php echo app(\'translator\')->getFromJson(foo(bar(baz(qux(breeze()))))); ?> space () <?php echo app(\'translator\')->getFromJson(foo(bar)); ?>', $compiler->compileString('@lang(foo(bar(baz(qux(breeze()))))) space () @lang(foo(bar))'));`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public function testExpressionWithinHTML()`
`23`	`23`	`{`
`24`	`24`	`$compiler = new BladeCompiler($this->getFiles(), __DIR__);`
`25`	`25`	`$this->assertEquals('<html <?php echo e($foo); ?>>', $compiler->compileString('<html {{ $foo }}>'));`
`26`	`26`	`$this->assertEquals('<html<?php echo e($foo); ?>>', $compiler->compileString('<html{{ $foo }}>'));`
`27`		`- $this->assertEquals('<html <?php echo e($foo); ?> <?php echo app(\'translator\')->get(\'foo\'); ?>>', $compiler->compileString('<html {{ $foo }} @lang(\'foo\')>'));`
	`27`	`+ $this->assertEquals('<html <?php echo e($foo); ?> <?php echo app(\'translator\')->getFromJson(\'foo\'); ?>>', $compiler->compileString('<html {{ $foo }} @lang(\'foo\')>'));`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`protected function getFiles()`
Original file line number	Diff line number	Diff line change
`@@ -17,14 +17,14 @@ public function testStatementThatContainsNonConsecutiveParanthesisAreCompiled()`
`17`	`17`	`{`
`18`	`18`	`$compiler = new BladeCompiler($this->getFiles(), __DIR__);`
`19`	`19`	`$string = "Foo @lang(function_call('foo(blah)')) bar";`
`20`		`- $expected = "Foo <?php echo app('translator')->get(function_call('foo(blah)')); ?> bar";`
	`20`	`+ $expected = "Foo <?php echo app('translator')->getFromJson(function_call('foo(blah)')); ?> bar";`
`21`	`21`	`$this->assertEquals($expected, $compiler->compileString($string));`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`public function testLanguageAndChoicesAreCompiled()`
`25`	`25`	`{`
`26`	`26`	`$compiler = new BladeCompiler($this->getFiles(), __DIR__);`
`27`		`- $this->assertEquals('<?php echo app(\'translator\')->get(\'foo\'); ?>', $compiler->compileString("@lang('foo')"));`
	`27`	`+ $this->assertEquals('<?php echo app(\'translator\')->getFromJson(\'foo\'); ?>', $compiler->compileString("@lang('foo')"));`
`28`	`28`	`$this->assertEquals('<?php echo app(\'translator\')->choice(\'foo\', 1); ?>', $compiler->compileString("@choice('foo', 1)"));`
`29`	`29`	`}`
`30`	`30`