nas/todo_api
2
1
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Improve debug mode

Browse source
This commit is contained in:
Maurits van der Schee 2018-09-24 20:25:42 +02:00
commit 5d056adfeb
5 changed files with 28 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
api.php
View file

@ -1774,15 +1774,16 @@ class GenericDB
$options = array(
\PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION,
\PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC,
\PDO::ATTR_PERSISTENT => true,
);
switch ($this->driver) {
case 'mysql':return $options + [
\PDO::ATTR_EMULATE_PREPARES => false,
\PDO::MYSQL_ATTR_FOUND_ROWS => true,
\PDO::ATTR_PERSISTENT => true,
];
case 'pgsql':return $options + [
\PDO::ATTR_EMULATE_PREPARES => false,
\PDO::ATTR_PERSISTENT => true,
];
case 'sqlsrv':return $options + [
\PDO::SQLSRV_ATTR_FETCHES_NUMERIC_TYPE => true,
@ -2803,7 +2804,7 @@ class AuthorizationMiddleware extends Middleware
$this->reflection = $reflection;
}
private function handleColumns(String $method, String $path, String $databaseName, String $tableName/*: void*/
private function handleColumns(String $method, String $path, String $databaseName, String $tableName) /*: void*/
{
$columnHandler = $this->getProperty('columnHandler', '');
if ($columnHandler) {
@ -2817,7 +2818,7 @@ class AuthorizationMiddleware extends Middleware
}
}
private function handleTable(String $method, String $path, String $databaseName, String $tableName/*: void*/
private function handleTable(String $method, String $path, String $databaseName, String $tableName) /*: void*/
{
if (!$this->reflection->hasTable($tableName)) {
return;
@ -2833,7 +2834,7 @@ class AuthorizationMiddleware extends Middleware
}
}
private function handleJoinTables(String $method, String $path, String $databaseName, array $joinParameters/*: void*/
private function handleJoinTables(String $method, String $path, String $databaseName, array $joinParameters) /*: void*/
{
$uniqueTableNames = array();
foreach ($joinParameters as $joinParameter) {
@ -2847,7 +2848,7 @@ class AuthorizationMiddleware extends Middleware
}
}
private function handleAllTables(String $method, String $path, String $databaseName/*: void*/
private function handleAllTables(String $method, String $path, String $databaseName) /*: void*/
{
$tableNames = $this->reflection->getTableNames();
foreach ($tableNames as $tableName) {
@ -3231,7 +3232,7 @@ class OpenApiDefinition extends DefaultOpenApiDefinition
$current = $value;
}
public function setPaths(DatabaseDefinition $database/*: void*/
public function setPaths(DatabaseDefinition $database) /*: void*/
{
$result = [];
foreach ($database->getTables() as $database) {
@ -3847,7 +3848,7 @@ class PathTree implements \JsonSerializable
private $tree;
public function __construct(object &$tree = null)
public function __construct( /* object */&$tree = null)
{
if (!$tree) {
$tree = $this->newTree();

8
docker/debian9/run.sh
View file

@ -44,8 +44,12 @@ echo "skipped"
echo -n "[4/4] Cloning PHP-CRUD-API v2 ... "
# install software
git clone --quiet https://github.com/mevdschee/php-crud-api.git
echo "done"
if [ -d /php-crud-api ]; then
echo "skipped"
else
git clone --quiet https://github.com/mevdschee/php-crud-api.git
echo "done"
fi
echo "------------------------------------------------"

3
docker/debug.sh
View file

@ -16,5 +16,6 @@ select f in "${options[@]}"; do
exit
fi
done
dir=$(pwd)/..
docker rm "php-crud-api_$f" > /dev/null 2>&1
docker run -ti --name "php-crud-api_$f" "php-crud-api:$f" /bin/bash -c '/usr/sbin/docker-run && cd php-crud-api && /bin/bash'
docker run -ti -v $dir:/php-crud-api --name "php-crud-api_$f" "php-crud-api:$f" /bin/bash -c '/usr/sbin/docker-run && cd php-crud-api && /bin/bash'

8
docker/ubuntu16/run.sh
View file

@ -59,8 +59,12 @@ echo "done"
echo -n "[4/4] Cloning PHP-CRUD-API v2 ... "
# install software
git clone --quiet https://github.com/mevdschee/php-crud-api.git
echo "done"
if [ -d /php-crud-api ]; then
echo "skipped"
else
git clone --quiet https://github.com/mevdschee/php-crud-api.git
echo "done"
fi
echo "------------------------------------------------"

8
docker/ubuntu18/run.sh
View file

@ -46,8 +46,12 @@ echo "skipped"
echo -n "[4/4] Cloning PHP-CRUD-API v2 ... "
# install software
git clone --quiet https://github.com/mevdschee/php-crud-api.git
echo "done"
if [ -d /php-crud-api ]; then
echo "skipped"
else
git clone --quiet https://github.com/mevdschee/php-crud-api.git
echo "done"
fi
echo "------------------------------------------------"