Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-01-11 17:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Karaka-Management/phpOMS into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-11-06 18:32:28 +01:00
commit 92200f82b2
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Uri/Argument.php
View File

@ -317,9 +317,9 @@ final class Argument implements UriInterface
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getPathElement(int $pos = 0) : string public function getPathElement(int $pos = 0, bool $useOffset = true) : string
{ {
return $this->pathElements[$pos + $this->pathOffset] ?? ''; return $this->pathElements[$pos + ($useOffset ? $this->pathOffset : 0)] ?? '';
} }
/** /**

4
Uri/HttpUri.php
View File

@ -384,9 +384,9 @@ final class HttpUri implements UriInterface
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function getPathElement(int $pos = 0) : string public function getPathElement(int $pos = 0, bool $useOffset = true) : string
{ {
return $this->pathElements[$pos + $this->pathOffset] ?? ''; return $this->pathElements[$pos + ($useOffset ? $this->pathOffset : 0)] ?? '';
} }
/** /**

5
Uri/UriInterface.php
View File

@ -117,13 +117,14 @@ interface UriInterface
/** /**
* Get path element. * Get path element.
* *
* @param int $pos Position of the path * @param int $pos Position of the path
* @param int $useOffset Uses internal path offset
* *
* @return string * @return string
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function getPathElement(int $pos = 0) : string; public function getPathElement(int $pos = 0, bool $useOffset = true) : string;
/** /**
* Get path elements. * Get path elements.

12
tests/Bootstrap.php
View File

@ -236,7 +236,7 @@ $CONFIG = [
'mssql' => [ 'mssql' => [
'admin' => [ 'admin' => [
'db' => 'mssql', /* db type */ 'db' => 'mssql', /* db type */
'host' => '127.0.0.1', /* db host address */ 'host' => 'localhost', /* db host address */
'port' => '1433', /* db host port */ 'port' => '1433', /* db host port */
'login' => 'sa', /* db login name */ 'login' => 'sa', /* db login name */
'password' => 'c0MplicatedP@ssword', /* db login password */ 'password' => 'c0MplicatedP@ssword', /* db login password */
@ -246,7 +246,7 @@ $CONFIG = [
], ],
'insert' => [ 'insert' => [
'db' => 'mssql', /* db type */ 'db' => 'mssql', /* db type */
'host' => '127.0.0.1', /* db host address */ 'host' => 'localhost', /* db host address */
'port' => '1433', /* db host port */ 'port' => '1433', /* db host port */
'login' => 'sa', /* db login name */ 'login' => 'sa', /* db login name */
'password' => 'c0MplicatedP@ssword', /* db login password */ 'password' => 'c0MplicatedP@ssword', /* db login password */
@ -256,7 +256,7 @@ $CONFIG = [
], ],
'select' => [ 'select' => [
'db' => 'mssql', /* db type */ 'db' => 'mssql', /* db type */
'host' => '127.0.0.1', /* db host address */ 'host' => 'localhost', /* db host address */
'port' => '1433', /* db host port */ 'port' => '1433', /* db host port */
'login' => 'sa', /* db login name */ 'login' => 'sa', /* db login name */
'password' => 'c0MplicatedP@ssword', /* db login password */ 'password' => 'c0MplicatedP@ssword', /* db login password */
@ -266,7 +266,7 @@ $CONFIG = [
], ],
'update' => [ 'update' => [
'db' => 'mssql', /* db type */ 'db' => 'mssql', /* db type */
'host' => '127.0.0.1', /* db host address */ 'host' => 'localhost', /* db host address */
'port' => '1433', /* db host port */ 'port' => '1433', /* db host port */
'login' => 'sa', /* db login name */ 'login' => 'sa', /* db login name */
'password' => 'c0MplicatedP@ssword', /* db login password */ 'password' => 'c0MplicatedP@ssword', /* db login password */
@ -276,7 +276,7 @@ $CONFIG = [
], ],
'delete' => [ 'delete' => [
'db' => 'mssql', /* db type */ 'db' => 'mssql', /* db type */
'host' => '127.0.0.1', /* db host address */ 'host' => 'localhost', /* db host address */
'port' => '1433', /* db host port */ 'port' => '1433', /* db host port */
'login' => 'sa', /* db login name */ 'login' => 'sa', /* db login name */
'password' => 'c0MplicatedP@ssword', /* db login password */ 'password' => 'c0MplicatedP@ssword', /* db login password */
@ -286,7 +286,7 @@ $CONFIG = [
], ],
'schema' => [ 'schema' => [
'db' => 'mssql', /* db type */ 'db' => 'mssql', /* db type */
'host' => '127.0.0.1', /* db host address */ 'host' => 'localhost', /* db host address */
'port' => '1433', /* db host port */ 'port' => '1433', /* db host port */
'login' => 'sa', /* db login name */ 'login' => 'sa', /* db login name */
'password' => 'c0MplicatedP@ssword', /* db login password */ 'password' => 'c0MplicatedP@ssword', /* db login password */