From c69bf16fd60292de405fc5e8a68fcab404b5f5d2 Mon Sep 17 00:00:00 2001 From: Peter Skirenko Date: Tue, 8 Dec 2020 13:42:31 +0000 Subject: [PATCH 1/3] Fix compatibility with parent class. --- content/content.debug.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/content.debug.php b/content/content.debug.php index 36d15b4..9b565df 100755 --- a/content/content.debug.php +++ b/content/content.debug.php @@ -39,7 +39,7 @@ public function __construct(){ } } - public function build() { + public function build(array context = array()) { $this->_view = (strlen(trim($_GET['debug'])) == 0 ? 'xml' : $_GET['debug']); return parent::build(); From 60017aac857b12a2e4bdff5aa732925b4fbb32a8 Mon Sep 17 00:00:00 2001 From: Peter Skirenko Date: Tue, 8 Dec 2020 13:53:35 +0000 Subject: [PATCH 2/3] Mark Symphony 3 compatibility. --- assets/devkit.css | 0 assets/devkit.js | 0 assets/jquery.scrollto.js | 0 extension.driver.php | 0 extension.meta.xml | 4 ++++ lib/bitter/bitter.php | 0 lib/bitter/formats/default.php | 0 lib/bitter/formats/symphony.php | 0 lib/bitter/formats/tabsize-2.php | 0 lib/bitter/formats/tabsize-4.php | 0 lib/bitter/languages/css.php | 0 lib/bitter/languages/html.php | 0 lib/bitter/languages/js.php | 0 lib/bitter/languages/php.php | 0 lib/bitter/languages/xml.php | 0 lib/bitter/languages/xsl.php | 0 lib/bitter/license | 0 lib/bitter/readme | 0 licence | 0 readme.md | 0 20 files changed, 4 insertions(+) mode change 100755 => 100644 assets/devkit.css mode change 100755 => 100644 assets/devkit.js mode change 100755 => 100644 assets/jquery.scrollto.js mode change 100755 => 100644 extension.driver.php mode change 100755 => 100644 lib/bitter/bitter.php mode change 100755 => 100644 lib/bitter/formats/default.php mode change 100755 => 100644 lib/bitter/formats/symphony.php mode change 100755 => 100644 lib/bitter/formats/tabsize-2.php mode change 100755 => 100644 lib/bitter/formats/tabsize-4.php mode change 100755 => 100644 lib/bitter/languages/css.php mode change 100755 => 100644 lib/bitter/languages/html.php mode change 100755 => 100644 lib/bitter/languages/js.php mode change 100755 => 100644 lib/bitter/languages/php.php mode change 100755 => 100644 lib/bitter/languages/xml.php mode change 100755 => 100644 lib/bitter/languages/xsl.php mode change 100755 => 100644 lib/bitter/license mode change 100755 => 100644 lib/bitter/readme mode change 100755 => 100644 licence mode change 100755 => 100644 readme.md diff --git a/assets/devkit.css b/assets/devkit.css old mode 100755 new mode 100644 diff --git a/assets/devkit.js b/assets/devkit.js old mode 100755 new mode 100644 diff --git a/assets/jquery.scrollto.js b/assets/jquery.scrollto.js old mode 100755 new mode 100644 diff --git a/extension.driver.php b/extension.driver.php old mode 100755 new mode 100644 diff --git a/extension.meta.xml b/extension.meta.xml index 9288018..0c0f135 100644 --- a/extension.meta.xml +++ b/extension.meta.xml @@ -17,6 +17,10 @@ + + - Update for PHP 7 + - Mark compatibility with Symphony 3.0 + - Mark compatibility with Symphony 2.7 diff --git a/lib/bitter/bitter.php b/lib/bitter/bitter.php old mode 100755 new mode 100644 diff --git a/lib/bitter/formats/default.php b/lib/bitter/formats/default.php old mode 100755 new mode 100644 diff --git a/lib/bitter/formats/symphony.php b/lib/bitter/formats/symphony.php old mode 100755 new mode 100644 diff --git a/lib/bitter/formats/tabsize-2.php b/lib/bitter/formats/tabsize-2.php old mode 100755 new mode 100644 diff --git a/lib/bitter/formats/tabsize-4.php b/lib/bitter/formats/tabsize-4.php old mode 100755 new mode 100644 diff --git a/lib/bitter/languages/css.php b/lib/bitter/languages/css.php old mode 100755 new mode 100644 diff --git a/lib/bitter/languages/html.php b/lib/bitter/languages/html.php old mode 100755 new mode 100644 diff --git a/lib/bitter/languages/js.php b/lib/bitter/languages/js.php old mode 100755 new mode 100644 diff --git a/lib/bitter/languages/php.php b/lib/bitter/languages/php.php old mode 100755 new mode 100644 diff --git a/lib/bitter/languages/xml.php b/lib/bitter/languages/xml.php old mode 100755 new mode 100644 diff --git a/lib/bitter/languages/xsl.php b/lib/bitter/languages/xsl.php old mode 100755 new mode 100644 diff --git a/lib/bitter/license b/lib/bitter/license old mode 100755 new mode 100644 diff --git a/lib/bitter/readme b/lib/bitter/readme old mode 100755 new mode 100644 diff --git a/licence b/licence old mode 100755 new mode 100644 diff --git a/readme.md b/readme.md old mode 100755 new mode 100644 From 0ea428bcc3195f670bf792b76f1b5042a37376da Mon Sep 17 00:00:00 2001 From: Peter Skirenko Date: Tue, 8 Dec 2020 17:31:57 +0000 Subject: [PATCH 3/3] Correction. --- content/content.debug.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/content.debug.php b/content/content.debug.php index 9b565df..c0dbacc 100755 --- a/content/content.debug.php +++ b/content/content.debug.php @@ -39,7 +39,7 @@ public function __construct(){ } } - public function build(array context = array()) { + public function build(array $context = array()) { $this->_view = (strlen(trim($_GET['debug'])) == 0 ? 'xml' : $_GET['debug']); return parent::build();