iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added comments and renamed short method to url generators

This commit is contained in:
msquare 2018-08-06 12:57:48 +02:00
parent 86b2937078
commit 9496e35711
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/model/User_model.php
View File

@ -33,7 +33,7 @@ function User_tshirt_score($user) {
WHERE `User`.`UID` = ? WHERE `User`.`UID` = ?
AND `Shifts`.`end` < ? AND `Shifts`.`end` < ?
GROUP BY `User`.`UID` GROUP BY `User`.`UID`
',[ ', [
$user['UID'], $user['UID'],
time() time()
]); ]);

4
src/Routing/LegacyUrlGenerator.php
View File

@ -14,7 +14,7 @@ class LegacyUrlGenerator extends UrlGenerator
* @param array $parameters * @param array $parameters
* @return string urls in the form <app url>/index.php?p=<path>&<parameters> * @return string urls in the form <app url>/index.php?p=<path>&<parameters>
*/ */
public function link_to($path, $parameters = []) public function linkTo($path, $parameters = [])
{ {
$page = ltrim($path, '/'); $page = ltrim($path, '/');
if (!empty($page)) { if (!empty($page)) {
@ -22,7 +22,7 @@ class LegacyUrlGenerator extends UrlGenerator
$parameters = array_merge(['p' => $page], $parameters); $parameters = array_merge(['p' => $page], $parameters);
} }
$uri = parent::link_to('index.php', $parameters); $uri = parent::linkTo('index.php', $parameters);
$uri = preg_replace('~(/index\.php)+~', '/index.php', $uri); $uri = preg_replace('~(/index\.php)+~', '/index.php', $uri);
return $uri; return $uri;

2
src/Routing/UrlGenerator.php
View File

@ -14,7 +14,7 @@ class UrlGenerator implements UrlGeneratorInterface
* @param array $parameters * @param array $parameters
* @return string url in the form [app url]/[path]?[parameters] * @return string url in the form [app url]/[path]?[parameters]
*/ */
public function link_to($path, $parameters = []) public function linkTo($path, $parameters = [])
{ {
$path = '/' . ltrim($path, '/'); $path = '/' . ltrim($path, '/');
$request = app('request'); $request = app('request');

2
src/Routing/UrlGeneratorInterface.php
View File

@ -12,5 +12,5 @@ interface UrlGeneratorInterface
* @param array $parameters * @param array $parameters
* @return string * @return string
*/ */
public function link_to($path, $parameters = []); public function linkTo($path, $parameters = []);
} }

2
src/helpers.php
View File

@ -124,7 +124,7 @@ function url($path = null, $parameters = [])
return $urlGenerator; return $urlGenerator;
} }
return $urlGenerator->link_to($path, $parameters); return $urlGenerator->linkTo($path, $parameters);
} }
/** /**

2
tests/Unit/HelpersTest.php
View File

@ -177,7 +177,7 @@ class HelpersTest extends TestCase
$this->assertEquals($urlGeneratorMock, url()); $this->assertEquals($urlGeneratorMock, url());
$urlGeneratorMock->expects($this->once()) $urlGeneratorMock->expects($this->once())
->method('link_to') ->method('linkTo')
->with('foo/bar', ['param' => 'value']) ->with('foo/bar', ['param' => 'value'])
->willReturn('http://lorem.ipsum/foo/bar?param=value'); ->willReturn('http://lorem.ipsum/foo/bar?param=value');

2
tests/Unit/Routing/LegacyUrlGeneratorTest.php
View File

@ -48,7 +48,7 @@ class LegacyUrlGeneratorTest extends TestCase
$urlGenerator = new LegacyUrlGenerator(); $urlGenerator = new LegacyUrlGenerator();
$this->assertInstanceOf(UrlGeneratorInterface::class, $urlGenerator); $this->assertInstanceOf(UrlGeneratorInterface::class, $urlGenerator);
$url = $urlGenerator->link_to($urlToPath, $arguments); $url = $urlGenerator->linkTo($urlToPath, $arguments);
$this->assertEquals($expectedUrl, $url); $this->assertEquals($expectedUrl, $url);
} }
} }

2
tests/Unit/Routing/UrlGeneratorTest.php
View File

@ -48,7 +48,7 @@ class UrlGeneratorTest extends TestCase
$urlGenerator = new UrlGenerator(); $urlGenerator = new UrlGenerator();
$this->assertInstanceOf(UrlGeneratorInterface::class, $urlGenerator); $this->assertInstanceOf(UrlGeneratorInterface::class, $urlGenerator);
$url = $urlGenerator->link_to($urlToPath, $arguments); $url = $urlGenerator->linkTo($urlToPath, $arguments);
$this->assertEquals($expectedUrl, $url); $this->assertEquals($expectedUrl, $url);
} }
} }