✨ switched from janitor jobs to cli commands

Signed-off-by: bnomei <[email protected]>

.php-cs-fixer.dist.php

@@ -13,7 +13,7 @@
 
 return (new PhpCsFixer\Config())
  ->setRules([
- '@PSR2' => true,
+ '@PSR12' => true,
  ])
  ->setFinder($finder)
 ;

.travis.yml

@@ -1,5 +1,5 @@
 language: php
-php: 8.0
+php: 8.1
 matrix:
  fast_finish: true
 install: composer install --no-interaction

classes/Lapse.php

@@ -207,7 +207,7 @@ public function keyFromObject($key): string
  $modified = $key->modified();
  }
  */
-  // @codeCoverageIgnoreEnd
+ // @codeCoverageIgnoreEnd
  } else {
  // ... or check file on disk now
  if ($key instanceof \Kirby\Cms\Site) {
@@ -274,7 +274,7 @@ public function updateIndex(?string $key = null, $indexLimit = null): ?int
  /**
  * @return bool
  */
- public function clean(): bool
+ public function prune(): bool
  {
  return $this->updateIndex(null, self::INDEX_LIMIT) <= self::INDEX_LIMIT;
  }

classes/LapseStatic.php

@@ -7,9 +7,9 @@
 
 class LapseStatic
 {
- static array $cache = [];
+ public static array $cache = [];
 
- static function getOrSet($key, Closure $closure)
+ public static function getOrSet($key, Closure $closure)
  {
  $key = Lapse::singleton()->keyFromObject($key);
 
@@ -24,4 +24,3 @@ static function getOrSet($key, Closure $closure)
  return static::$cache[$key];
  }
 }
-

composer.json

@@ -1,7 +1,7 @@
 {
  "name": "bnomei/kirby3-lapse",
  "type": "kirby-plugin",
- "version": "3.0.0",
+ "version": "3.1.0",
  "description": "Cache any data until set expiration time",
  "license": "MIT",
  "authors": [
@@ -40,7 +40,7 @@
  "getkirby/composer-installer": "^1.2"
  },
  "require-dev": {
- "getkirby/cms": "^3.5",
+ "getkirby/cms": "^3.8.1.1",
  "php-coveralls/php-coveralls": "^2.4",
  "phpunit/phpunit": "^9.5"
  },

index.php

@@ -30,13 +30,21 @@ function lapseStatic($key, Closure $closure, $expires = null)
  'cache' => true,
  'expires' => 0,
  'indexLimit' => null,
- 'jobs' => [ // https://github.com/bnomei/kirby3-janitor
- 'cleanLapse' => function (Kirby\Cms\Page $page = null, string $data = null) {
- return \Bnomei\Lapse::singleton()->clean();
+ ],
+ 'commands' => [ // https://github.com/getkirby/cli
+ 'lapse:prune' => [
+ 'description' => 'Prune cache Lapse plugin',
+ 'args' => [],
+ 'command' => static function ($cli) {
+ return \Bnomei\Lapse::singleton()->prune();
  },
- 'flushLapse' => function (Kirby\Cms\Page $page = null, string $data = null) {
+ ],
+ 'lapse:flush' => [
+ 'description' => 'Flush cache of Lapse plugin',
+ 'args' => [],
+ 'command' => static function ($cli) {
  return \Bnomei\Lapse::singleton()->flush();
  },
- ],
+ ]
  ],
 ]);

tests/bootstrap.php

@@ -1,4 +1,5 @@
 <?php
+
 //require_once __DIR__ . '/bootstrap.php';
 require_once __DIR__ . '/../vendor/autoload.php';
 

tests/index.php

@@ -1,3 +1,4 @@
 <?php
+
 require __DIR__ . '/../vendor/autoload.php';
-echo (new Kirby)->render();
+echo (new Kirby())->render();

tests/site/templates/default.php

@@ -1,7 +1,8 @@
 <?php
+
  echo '<pre>';
  var_dump(kirby()->language()->code());
  var_dump($page->title()->value());
-var_dump($page->modified('c'));
-var_dump(\Bnomei\Lapse::hash([$page]));
+ var_dump($page->modified('c'));
+ var_dump(\Bnomei\Lapse::hash([$page]));
  var_dump(\Bnomei\Lapse::gt([$page]));

vendor/autoload.php

@@ -3,8 +3,21 @@
 // autoload.php @generated by Composer
 
 if (PHP_VERSION_ID < 50600) {
- echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
- exit(1);
+ if (!headers_sent()) {
+ header('HTTP/1.1 500 Internal Server Error');
+ }
+ $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+ if (!ini_get('display_errors')) {
+ if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+ fwrite(STDERR, $err);
+ } elseif (!headers_sent()) {
+ echo $err;
+ }
+ }
+ trigger_error(
+ $err,
+ E_USER_ERROR
+ );
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';

vendor/composer/installed.php

@@ -1,8 +1,8 @@
 <?php return array(
  'root' => array(
  'name' => 'bnomei/kirby3-lapse',
- 'pretty_version' => '3.0.0',
- 'version' => '3.0.0.0',
+ 'pretty_version' => '3.1.0',
+ 'version' => '3.1.0.0',
  'reference' => NULL,
  'type' => 'kirby-plugin',
  'install_path' => __DIR__ . '/../../',
@@ -11,8 +11,8 @@
  ),
  'versions' => array(
  'bnomei/kirby3-lapse' => array(
- 'pretty_version' => '3.0.0',
- 'version' => '3.0.0.0',
+ 'pretty_version' => '3.1.0',
+ 'version' => '3.1.0.0',
  'reference' => NULL,
  'type' => 'kirby-plugin',
  'install_path' => __DIR__ . '/../../',