=Cache::connects throughout codebase refactored

Jake Vanderwerf

2026-08-26 18e7e415339ccc9adf8ade562f93abef606da16d

 inc/registrar/config/seo/Schema.php

@@ -23,6 +23,7 @@

   protected array $properties = [];
   protected array $referenceProperties = [];
   protected array $extras = [];
   protected array $defaultReference = [
      'name'   => '{{post_title}}',
      'url' => '{{post_permalink}}',
@@ -53,9 +54,10 @@
      $this->referenceCache = Cache::for('schemaReference');
      $this->archiveCache = Cache::for('schemaArchive');
      if ($registrar) {
         $this->cache->connect($registrar->getType());
         $this->referenceCache->connect($registrar->getType());
         $this->archiveCache->connect($registrar->getType());
         $type = $registrar->getType();
         $this->cache = Cache::for('schema', $type);
         $this->referenceCache = Cache::for('schemaReference', $type);
         $this->archiveCache = Cache::for('schemaArchive', $type);

         switch ($registrar->getType()) {
            case 'term':
@@ -67,6 +69,8 @@
         }
         $this->defaultArchive['description'] = '{{registrar.'.$slug.'.description}}';
      }

      $this->extras = apply_filters(BASE.ucfirst($slug).'Extras', []);
      $this->initFilters();
      $this->registerHooks();
   }
@@ -90,49 +94,8 @@
      add_action('wp_head', [$this, 'outputSchema'], 1);
      add_filter('the_seo_framework_schema_graph_data', [$this, 'filterTSFSchema'], 10, 2);
      add_filter('the_seo_framework_title_from_custom_field', [$this, 'filterTSFOGTitle'], 10, 2);

      $this->maybeExcludeSingles();
   }
      protected function maybeExcludeSingles(): void
      {
         $exclude = $this->cache->remember(
            'excludeSingles',
            function () {
               $exclude = [];
               $registrar = Registrar::getInstance($this->slug);
               if ($registrar && $registrar->hasFeature('hide_single')) {
                  $exclude = $this->excludeSingle();
               }
               if ($registrar && $registrar->hasFeature('is_timeline')) {
                  $exclude = array_merge($exclude, $this->excludeTimeline());
               }
               return $exclude;
            }
         );

         if (!empty($exclude)) {
            add_filter('the_seo_framework_sitemap_exclude_ids', $exclude);
         }
      }
      protected function excludeSingle():array
      {
         return get_posts([
            'post_type'    => jvbCheckBase($this->slug),
            'posts_per_page'=> -1,
            'fields'    => 'ids',
            'post_status'  => 'publish',
         ]);
      }
      protected function excludeTimeline():array
      {
         return get_posts([
            'post_type'    => jvbCheckBase($this->slug),
            'posts_per_page'=> -1,
            'fields'    => 'ids',
            'post_status'  => 'publish',
            'post_parent__not_in'   => [0], // Only get posts with a parent
         ]);
      }
   public function filterTSFSchema(array $graph, ?array $args):array
   {
      $based = jvbCheckBase($this->slug);
@@ -180,8 +143,11 @@

               $config = $this->getConfig();

               $class = JVB()->schemaHelper()::classFromConfig($config, $meta);
               $class->setAuthor(JVB()->seo()->getCreator(true));
               $class = SchemaHelper::getInstance()::classFromConfig($config, $meta);
               if (property_exists($class, 'author')) {
                  $class->setAuthor(SchemaOutput::getInstance()->getCreator(true));
               }


               $class = apply_filters('jvb_single_'.$this->slug.'_schema_output', $class, $ID);
               return $class->outputSchema();
@@ -193,14 +159,12 @@
      public function outputContentTaxArchiveSchema():array
      {
         $ID = get_the_ID();
         if (JVB_TESTING) {
            $this->cache->flush();
         }

         return $this->cache->remember(
            $ID,
            function() use ($ID) {
               $action = BASE.ucfirst($this->slug).'Schema';
               $config = JVB()->schemaHelper()::schema($action);
               $config = SchemaHelper::getInstance()::schema($action);

               if (!array_key_exists('type', $config)) {
                  $config['type'] = 'JVBase\inc\managers\SEO\render\Thing\CreativeWork\WebPage\CollectionPage\CollectionPage';
@@ -209,7 +173,7 @@
                  error_log('No class found for archive schema output: '.$config['type']);
                  return [];
               }
               $class = JVB()->schemaHelper()::classFromConfig($config);
               $class = SchemaHelper::getInstance()::classFromConfig($config);

               $class->setIsPartOf(get_home_url().'/#website');
               $itemList = new render\Thing\Intangible\ItemList\ItemList();
@@ -243,12 +207,17 @@
         if (JVB_TESTING){
            $this->archiveCache->flush();
         }

         $this->archiveCache->flush();
         return $this->archiveCache->remember(
            $this->slug,
            function() {

               $action = BASE.ucfirst($this->slug).'Archive';
               $config = JVB()->schemaHelper()->archive($this->slug);
               $override = apply_filters($action.'Override', []);
               if (!empty($override)) {
                  return $override;
               }
               $config = SchemaHelper::getInstance()->archive($this->slug);
               if (!array_key_exists('type', $config)) {
                  $config['type'] = 'JVBase\inc\managers\SEO\render\Thing\CreativeWork\WebPage\CollectionPage\CollectionPage';
               }
@@ -269,12 +238,12 @@
               $obj = get_queried_object();
               $meta = (property_exists($obj, 'taxonomy')) ? Meta::forTerm($obj->term_id) : null;

               $class = JVB()->schemaHelper()::classFromConfig($config, $meta);
               $class = SchemaHelper::getInstance()::classFromConfig($config, $meta);

               $class->setIsPartOf(get_home_url().'/#website');
               $itemList = new render\Thing\Intangible\ItemList\ItemList();
               $items = new WP_Query([
                  'post_type'    => jvbCheckBase($this->slug),
                  'post_type'    => $registrar->getBased(),
                  'posts_per_page'=> 25,
                  'post_status'  => 'publish',
                  'fields'    => 'ids'
@@ -294,12 +263,7 @@
               $itemList->setItemListElement($itemListItems);
               $class->setMainEntity($itemList);

               $schema = $class->outputSchema();
               if (JVB_TESTING) {
//                error_log('Generated archive schema: '.print_r($schema, true));
               }

               return $schema;
               return $class->outputSchema();
            }
         );
      }
@@ -313,6 +277,13 @@
      $cached = $this->referenceCache->remember(
         $ID,
         function () use ($ID, $type) {

            $postType = get_post_type($ID);
            $function = BASE.'build_singular_'.jvbNoBase($postType).'_schema_reference';

            if (function_exists($function)) {
               return $function($ID);
            }
            switch ($type) {
               case 'post':
                  $meta = Meta::forPost($ID);
@@ -328,8 +299,11 @@
                  $meta = null;
            }
            $config = $this->getConfig();
            $class = JVB()->schemaHelper()::classFromConfig($config, $meta);
            $class->delete('about');
            $class = SchemaHelper::getInstance()::classFromConfig($config, $meta);
            if ($class) {
               $class->delete('about');
            }


            switch ($type) {
               case 'post':
@@ -354,7 +328,7 @@
         error_log('[SEO]Schema::getConfig Invalid type: '.$type);
         return [];
      }
      return JVB()->schemaHelper()::getConfig($this->slug, $type);
      return SchemaHelper::getInstance()::getConfig($this->slug, $type);
   }

   public function resolveMeta(array $config, Meta $meta):array
@@ -473,10 +447,12 @@
            'type'   => 'JVBase\inc\managers\SEO\render\Thing\CreativeWork\Comment\Answer',
            'text'   => wp_strip_all_tags(str_replace("\n", '', $meta->get('post_content'))),
         ],
         'answerCount'  => 1,
      ];
      $question = SchemaHelper::classFromConfig($question);
      $page->setMainEntity($question);
      $page->setAuthor(JVB()->seo()->getCreator(true));

      $page->setAuthor(SchemaOutput::getInstance()->getCreator(true));
      return $page->outputSchema();

   }
@@ -516,7 +492,7 @@
      }

      $page->setImage($images);
      $page->setAuthor(JVB()->seo()->getCreator(true));
      $page->setAuthor(SchemaOutput::getInstance()->getCreator(true));
      return $page->outputSchema();

   }
@@ -659,4 +635,20 @@
      $page->setMainEntity($termset);
      return $page->outputSchema();
   }

   public function extra():array
   {
      if (empty($this->extras)) {
         return [];
      }
      $out = [];
      foreach ($this->extras as $config) {
         $schema = SchemaHelper::classFromConfig($config);
         $output = $schema->outputSchema();
         if (!empty($output)) {
            $out[] = $output;
         }
      }
      return $out;
   }
}