Merge pull request #437 from codepress/release/7.0.5

Release 7.0.5

Author: DGStefan

api.php

@@ -53,14 +53,14 @@ function ac_get_list_screen(string $id): ?ListScreen
  * For usage @see https://docs.admincolumns.com/article/57-code-snippets
  */
 if ( ! function_exists('ac_get_list_screens')) {
-    function ac_get_list_screens(string $key): ListScreenCollection
+    function ac_get_list_screens(string $table_id): ListScreenCollection
     {
         if ( ! did_action('wp_loaded')) {
             throw new RuntimeException("Call after the `wp_loaded` hook.");
         }
 
         return Container::get_storage()->find_all_by_table_id(
-            new TableId($key)
+            new TableId($table_id)
         );
     }
 }

classes/Admin/Admin.php

@@ -2,6 +2,7 @@
 
 namespace AC\Admin;
 
+use AC;
 use AC\AdminColumns;
 use AC\Registerable;
 
@@ -10,11 +11,11 @@ class Admin implements Registerable
 
     public const NAME = 'codepress-admin-columns';
 
-    private $request_handler;
+    private RequestHandlerInterface $request_handler;
 
-    private $location;
+    private AC\Asset\Location $location;
 
-    private $scripts;
+    private AdminScripts $scripts;
 
     public function __construct(RequestHandlerInterface $request_handler, AdminColumns $plugin, AdminScripts $scripts)
     {

classes/Admin/Asset/Columns.php

@@ -122,7 +122,7 @@ public function get_pro_modal_arguments(): array
 
         foreach ($items as $utm_content => $label) {
             $features[] = [
-                'url'   => $upgrade_page_url->add_content('usp-' . $utm_content)->get_url(),
+                'url'   => $upgrade_page_url->with_content('usp-' . $utm_content)->get_url(),
                 'label' => $label,
             ];
         }

classes/Column/ColumnFactory.php

@@ -23,7 +23,7 @@ protected function get_settings(Config $config): ComponentCollection
 
     protected function get_context(Config $config): Context
     {
-        return new Context($config);
+        return new Context($config, $this->get_label());
     }
 
     protected function get_formatters(Config $config): FormatterCollection

classes/Column/Context.php

@@ -12,9 +12,12 @@ class Context implements AC\Setting\Context
 
     protected Config $config;
 
-    public function __construct(Config $config)
+    private string $label;
+
+    public function __construct(Config $config, string $label)
     {
         $this->config = $config;
+        $this->label = $label;
     }
 
     public function get_type(): string
@@ -27,6 +30,16 @@ public function get_name(): string
         return $this->get('name', '');
     }
 
+    public function get_label(): string
+    {
+        return $this->get('label', '');
+    }
+
+    public function get_type_label(): string
+    {
+        return $this->label;
+    }
+
     public function has(string $key): bool
     {
         return $this->config->has($key);

classes/Column/CustomFieldContext.php

@@ -5,6 +5,7 @@
 namespace AC\Column;
 
 use AC\Setting\Config;
+use AC\Type\TableScreenContext;
 
 class CustomFieldContext extends Context
 {
@@ -13,12 +14,20 @@ class CustomFieldContext extends Context
 
     private string $meta_key;
 
-    public function __construct(Config $config, string $field_type, string $meta_key)
-    {
-        parent::__construct($config);
+    private TableScreenContext $table;
+
+    public function __construct(
+        Config $config,
+        string $label,
+        string $field_type,
+        string $meta_key,
+        TableScreenContext $table
+    ) {
+        parent::__construct($config, $label);
 
         $this->field_type = $field_type;
         $this->meta_key = $meta_key;
+        $this->table = $table;
     }
 
     public function get_field_type(): string
@@ -31,4 +40,23 @@ public function get_meta_key(): string
         return $this->meta_key;
     }
 
+    public function get_meta_type(): string
+    {
+        return (string)$this->table->get_meta_type();
+    }
+
+    public function get_post_type(): ?string
+    {
+        return $this->table->has_post_type()
+            ? (string)$this->table->get_post_type()
+            : null;
+    }
+
+    public function get_taxonomy(): ?string
+    {
+        return $this->table->has_taxonomy()
+            ? (string)$this->table->get_taxonomy()
+            : null;
+    }
+
 }

classes/ColumnFactories/BaseFactory.php

@@ -39,7 +39,7 @@ public function create(TableScreen $table_screen): ColumnFactories
             ];
 
             if ($table_screen instanceof TableScreen\MetaType) {
-                $defaults['table_screen_context'] = TableScreenContext::from_table_screen($table_screen);
+                $defaults['table_context'] = TableScreenContext::from_table_screen($table_screen);
             }
 
             foreach ($factories as $factory) {

classes/ColumnFactories/PostFactory.php

@@ -33,7 +33,7 @@ protected function get_factories(TableScreen $table_screen): ColumnFactoryDefini
             new ColumnFactoryDefinition(
                 AC\ColumnFactory\CustomFieldFactory::class,
                 [
-                    'table_screen_context' => $table_screen_context,
+                    'table_context' => $table_screen_context,
                 ]
             )
         );

classes/ColumnFactory/CustomFieldFactory.php

@@ -22,7 +22,7 @@ class CustomFieldFactory extends BaseColumnFactory
 
     private FieldType $field_type;
 
-    private TableScreenContext $table_screen_context;
+    private TableScreenContext $table_context;
 
     private ComponentFactory\BeforeAfter $before_after;
 
@@ -31,7 +31,7 @@ class CustomFieldFactory extends BaseColumnFactory
     public function __construct(
         DefaultSettingsBuilder $default_settings_builder,
         ComponentFactory\CustomFieldFactory $custom_field_factory,
-        TableScreenContext $table_screen_context,
+        TableScreenContext $table_context,
         FieldType $field_type,
         ComponentFactory\BeforeAfter $before_after,
         ComponentFactory\Pro\TogglePromotionFactory $pro_promotion_factory
@@ -42,15 +42,15 @@ public function __construct(
 
         $this->custom_field_factory = $custom_field_factory;
         $this->field_type = $field_type;
-        $this->table_screen_context = $table_screen_context;
+        $this->table_context = $table_context;
         $this->before_after = $before_after;
         $this->pro_promotion_factory = $pro_promotion_factory;
     }
 
     protected function get_settings(Config $config): ComponentCollection
     {
         return new ComponentCollection([
-            $this->custom_field_factory->create($this->table_screen_context)->create($config),
+            $this->custom_field_factory->create($this->table_context)->create($config),
             $this->field_type->create($config),
             $this->before_after->create($config),
             $this->pro_promotion_factory->create(__('Enable Editing', 'codepress-admin-columns'))->create($config),
@@ -80,15 +80,15 @@ protected function get_formatters(Config $config): FormatterCollection
             return $formatters->prepend(
                 Aggregate::from_array([
                     new AC\Formatter\MetaCollection(
-                        $this->table_screen_context->get_meta_type(), $config->get('field', '')
+                        $this->table_context->get_meta_type(), $config->get('field', '')
                     ),
                     new AC\Formatter\Count(),
                 ])
             );
         }
 
         return $formatters->prepend(
-            new AC\Formatter\Meta($this->table_screen_context->get_meta_type(), $config->get('field', ''))
+            new AC\Formatter\Meta($this->table_context->get_meta_type(), $config->get('field', ''))
         );
     }
 

classes/ColumnFactory/Media/FileSizeFactory.php

@@ -5,8 +5,8 @@
 namespace AC\ColumnFactory\Media;
 
 use AC\Column\BaseColumnFactory;
+use AC\Formatter\FileSizeReadable;
 use AC\Formatter\Media\FileSize;
-use AC\Formatter\ReadableFileSize;
 use AC\FormatterCollection;
 use AC\Setting\Config;
 
@@ -28,7 +28,7 @@ protected function get_formatters(Config $config): FormatterCollection
         $formatters = parent::get_formatters($config);
 
         $formatters->add(new FileSize());
-        $formatters->add(new ReadableFileSize());
+        $formatters->add(new FileSizeReadable());
 
         return $formatters;
     }