Skip to content

Typo3 9 #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavidBruchmann wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Typo3 9 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14f89ce
using currently newest version of pelago/emogrifer for usage with als…
DavidBruchmann Jun 7, 2019
42e8048
remove comment with old code.
DavidBruchmann Jun 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 7 additions & 39 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"html",
"newsletters"
],
"version": "7.0.0",
Copy link
Owner

@xperseguers xperseguers Jun 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version should not be hardcoded, it is inferred from git tag.

Copy link
Author

@DavidBruchmann DavidBruchmann Jun 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I never understood that till this easy explanation ;-)

"homepage": "https://github.com/xperseguers/t3ext-css2inline",
"support": {
"issues": "https://github.com/xperseguers/t3ext-css2inline/issues"
Expand All @@ -24,50 +25,17 @@
],
"license": "LGPL-3.0",
"require": {
"php": ">= 5.5.0, <= 7.1.99",
"typo3/cms": ">= 7.6.0, <= 8.7.99",
"pelago/emogrifier": "^1.2"
"php": ">= 5.5.0, <= 7.3.99",
"typo3/cms-core": ">= 7.6.0, <= 9.5.99",
Copy link
Owner

@xperseguers xperseguers Jun 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TYPO3 v7 is not maintained anymore (except ELTS but I don't care).

Point is the dependency to typo3/cms-core is wrong for TYPO3 v7 since it does not exist there. Please see the tags on https://packagist.org/packages/typo3/cms-core

Next, having the dependency to v8 and v9 only means PHP dependency should be changed to at least 7.0

Copy link
Author

@DavidBruchmann DavidBruchmann Jun 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right, I forgot about the missing versions of cms-core.

"pelago/emogrifier": "^2.1"
},
"replace": {
"css2inline": "self.version",
"typo3-ter/css2inline": "self.version"
},
"config": {
"vendor-dir": ".Build/vendor",
"bin-dir": ".Build/bin"
},
"scripts": {
"post-autoload-dump": [
"mkdir -p .Build/Web/typo3conf/ext/",
"[ -L .Build/Web/typo3conf/ext/css2inline ] || ln -snvf ../../../../. .Build/Web/typo3conf/ext/css2inline"
],
"extension-create-libs": [
"mkdir -p Libraries/temp",
"[ -f $HOME/.composer/vendor/bin/phar-composer ] || composer global require clue/phar-composer",
"if [ ! -f Libraries/pelago-emogrifier.phar ]; then cd Libraries/temp && composer require pelago/emogrifier=^1.2 && composer config classmap-authoritative true && composer config prepend-autoloader false && composer dump-autoload; fi",
"[ -f Libraries/pelago-emogrifier.phar ] || $HOME/.composer/vendor/bin/phar-composer build Libraries/temp/ Libraries/pelago-emogrifier.phar",
"chmod -x Libraries/*.phar",
"rm -rf Libraries/temp"
],
"extension-build": [
"@extension-create-libs"
],
"extension-release": [
"@extension-build",
"rm -rf Tests/",
"rm .gitignore"
],
"extension-clean": [
"rm -rf Libraries"
"autoload": {
"classmap": [
"pi1/"
]
},
"extra": {
"branch-alias": {
"dev-master": "0.3.x-dev"
},
"typo3/cms": {
"cms-package-dir": "{$vendor-dir}/typo3/cms",
"web-dir": ".Build/Web"
}
}
}
6 changes: 3 additions & 3 deletions ext_emconf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
'description' => 'Moves the styles from CSS sheets into inline CSS, in order to comply with uncooperative email clients. Can be used as a post-processing stdWrap in TypoScript.',
'category' => 'plugin',
'shy' => 0,
'version' => '0.3.0-dev',
'version' => '7.0.0',
Copy link
Owner

@xperseguers xperseguers Jun 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What??? How can you justify to bump the version from 0.x to 7.0 ??? 1.0.0 (-dev) would be OK but I absolutely don't see how you could jump to an arbitrary 7.0.0.

Copy link
Author

@DavidBruchmann DavidBruchmann Jun 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was related to TYPO3 Version 7, but if you want to bump that, I'd even would propose 8.0.0.
That scheme is used by other extensions like gridelements too.

Copy link
Author

@DavidBruchmann DavidBruchmann Jun 7, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On the other hand we've no separated version for TYPO3 8 and 9, so I'm fine with a version-scheme that is independent from TYPO3 version.

'dependencies' => '',
'conflicts' => '',
'priority' => '',
Expand All @@ -34,8 +34,8 @@
'CGLcompliance_note' => '',
'constraints' => [
'depends' => [
'typo3' => '7.6.0-8.7.99',
'php' => '5.5.0-7.1.99'
'typo3' => '7.6.0-9.5.99',
'php' => '5.5.0-7.3.99'
],
'conflicts' => [],
'suggests' => [],
Expand Down
6 changes: 0 additions & 6 deletions pi1/class.tx_css2inline_pi1.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@ class tx_css2inline_pi1 extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
*/
public function main($content, array $conf)
{
// Require 3rd-party libraries, in case TYPO3 does not run in composer mode
$pharFileName = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey) . 'Libraries/pelago-emogrifier.phar';
if (is_file($pharFileName)) {
@include 'phar://' . $pharFileName . '/vendor/autoload.php';
}

$css = $this->cObj->cObjGetSingle($conf['css'], $conf['css.']);
$html = $this->cObj->cObjGetSingle($conf['html'] ?: 'COA', $conf['html.']);

Expand Down