(refactor): skip prefilling when identification session is active in editor

Author: Mike van den Hoek

.gitignore

@@ -36,7 +36,7 @@
 # track this file .gitignore (i.e. do NOT ignore it)
 !.gitignore
 
-!.php_cs
+!.php-cs-fixer.php
 
 # Eslint
 !.eslintrc

.php-cs-fixer.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+$finder = PhpCsFixer\Finder::create()
+	->notPath('vendor')
+	->notPath('node_modules')
+	->in(__DIR__)
+	->in('./resources/views')
+	->in('./config')
+	->name('*.php')
+	->notName('*.blade.php')
+	->ignoreDotFiles(true)
+	->ignoreVCS(true);
+
+return (new PhpCsFixer\Config)
+	->setRules([
+		'@PSR2' => true,
+		'array_syntax' => [
+			'syntax' => 'short',
+		],
+		'ordered_imports' => [
+			'sort_algorithm' => 'alpha',
+		],
+		'no_unused_imports' => true,
+		'binary_operator_spaces' => [
+			'default' => 'single_space',
+			'operators' => [
+				'=>' => null,
+				'|' => 'no_space',
+			],
+		],
+		'full_opening_tag' => true,
+		'yoda_style' => [
+			'always_move_variable' => true,
+			'equal' => true,
+			'identical' => true,
+			'less_and_greater' => true,
+		],
+	])
+	->setFinder($finder);

build/blocks.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n'), 'version' => '33b24b2f8a8b7ff4f915');
+<?php return ['dependencies' => ['react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n'], 'version' => '33b24b2f8a8b7ff4f915'];

build/icons.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '12341f29470476729a0c');
+<?php return ['dependencies' => [], 'version' => '12341f29470476729a0c'];

build/style.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => 'd63fd4982613309d5c57');
+<?php return ['dependencies' => [], 'version' => 'd63fd4982613309d5c57'];

src/PrefillGravityForms/Controllers/BaseController.php

@@ -11,8 +11,8 @@
 use OWC\PrefillGravityForms\Foundation\TeamsLogger;
 use OWC\PrefillGravityForms\GravityForms\GravityFormsSettings;
 use OWC\PrefillGravityForms\Traits\SessionTrait;
-
 use TypeError;
+use WP_Screen;
 use function Yard\DigiD\Foundation\Helpers\resolve;
 
 abstract class BaseController
@@ -36,6 +36,17 @@ public function __construct()
 
     abstract public function handle(array $form): array;
 
+    protected function isBlockEditor(): bool
+    {
+        global $current_screen;
+
+        if (! $current_screen instanceof WP_Screen) {
+            return false;
+        }
+
+        return method_exists($current_screen, 'is_block_editor') && $current_screen->is_block_editor();
+    }
+
     public function get(): array
     {
         return static::makeRequest();

src/PrefillGravityForms/Controllers/EnableUController.php

@@ -1,11 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace OWC\PrefillGravityForms\Controllers;
 
 class EnableUController extends BaseController
 {
     public function handle(array $form): array
     {
+        if ($this->isBlockEditor()) {
+            return $form;
+        }
+
         $bsn = $this->getBSN();
 
         if (empty($bsn)) {

src/PrefillGravityForms/Controllers/PinkRoccadeController.php

@@ -1,11 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace OWC\PrefillGravityForms\Controllers;
 
 class PinkRoccadeController extends BaseController
 {
     public function handle(array $form): array
     {
+        if ($this->isBlockEditor()) {
+            return $form;
+        }
+
         $bsn = $this->getBSN();
 
         if (empty($bsn)) {

src/PrefillGravityForms/Controllers/VrijBRPController.php

@@ -8,6 +8,10 @@ class VrijBRPController extends BaseController
 {
     public function handle(array $form): array
     {
+        if ($this->isBlockEditor()) {
+            return $form;
+        }
+
         $bsn = $this->getBSN();
 
         if (empty($bsn)) {

src/PrefillGravityForms/Controllers/WeAreFrankController.php

@@ -8,6 +8,10 @@ class WeAreFrankController extends BaseController
 {
     public function handle(array $form): array
     {
+        if ($this->isBlockEditor()) {
+            return $form;
+        }
+
         $bsn = $this->getBSN();
 
         if (empty($bsn)) {