noccy/php-spark
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Misc fixes

Browse Source 
* Updated build scripts to handle gitless environments a little
  better
* PDO shell plugin improvements
* More tests
This commit is contained in:
Chris
2021-12-17 12:51:29 +01:00
parent 1eab339347
commit 0f45219747
10 changed files with 165 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/com.noccy.apiclient/Commands/ApiLogsCommand.php
View File

@ -6,6 +6,7 @@ use Spark\Commands\Command;
use SparkPlug;
use SparkPlug\Com\Noccy\ApiClient\Api\Method;
use SparkPlug\Com\Noccy\ApiClient\ApiClientPlugin;
use SparkPlug\Com\Noccy\ApiClient\Log\RequestData;
use SparkPlug\Com\Noccy\ApiClient\Request\RequestBuilder;
use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Input\InputArgument;
@ -29,7 +30,17 @@ class ApiLogsCommand extends Command
/** @var ApiClientPlugin */
$plugin = get_plugin('com.noccy.apiclient');
$iter = $plugin->getLogIterator("default");
foreach ($iter as $index=>$log) {
$this->dumpLog($log, $index, $output);
}
return Command::SUCCESS;
}
private function dumpLog(array $log, int $index, OutputInterface $output)
{
$output->writeln("<comment>#{$index}</> <options=bold>{$log['request']['info']['query']}</> (<info>{$log['method']}</>) ".strlen($log['response']['body'])."b");
}
}

9
plugins/com.noccy.apiclient/sparkplug.php
View File

@ -4,6 +4,7 @@ namespace SparkPlug\Com\Noccy\ApiClient;
use SparkPlug;
use SparkPlug\Com\Noccy\ApiClient\Log\RequestLog;
use SparkPlug\Com\Noccy\ApiClient\Log\LogIterator;
class ApiClientPlugin extends SparkPlug
{
@ -113,6 +114,14 @@ class ApiClientPlugin extends SparkPlug
$log = new RequestLog($logsDir.$name.".json");
return $log;
}
public function getLogIterator(string $name): LogIterator
{
$env = get_environment();
$logsDir = $env->getConfigDirectory() . "/api/logs/";
$iter = new LogIterator($logsDir.$name.".json");
return $iter;
}
}
register_plugin("com.noccy.apiclient", new ApiClientPlugin);

23
plugins/com.noccy.pdo.shell/Shell/PdoShell.php
View File

@ -4,6 +4,7 @@ namespace SparkPlug\Com\Noccy\Pdo\Shell\Shell;
use SparkPlug\Com\Noccy\Pdo\PdoResource;
use Spark\Commands\Command;
use Spark\SparkApplication;
use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Helper\TableSeparator;
use Symfony\Component\Console\Input\InputArgument;
@ -178,6 +179,9 @@ class PdoShell {
$query = $json['query']??'?';
$res = $json['result']??[];
} else {
if (!$this->lastQuery) {
return;
}
$query = $this->lastQuery['query'];
$res = $this->lastQuery['result'];
}
@ -223,6 +227,25 @@ class PdoShell {
private function doSelectCommand(array $args)
{
$name = array_shift($args);
if (!$name) {
$app = SparkApplication::$instance;
$resources = $app->getResourceManager();
$named = $resources->getAllNamedResources();
foreach ($named as $name=>$resource) {
if (!($resource instanceof PdoResource)) {
continue;
}
$this->output->writeln(
sprintf(" <comment>%s</><info>%s</>", ($name==$this->resource?"*":" "), $name)
);
}
return;
}
$res = get_resource($name);
if ($res instanceof PdoResource) {
$this->db = $res;