Skip to content

Commit 18cbd97

Browse files
misterboemisterboe
committed
Merge branch 'release/1.0.3'
2 parents d3c5edb + de9ec4e commit 18cbd97

File tree

17 files changed

+107
-47
lines changed

17 files changed

+107
-47
lines changed

‎Resources/Build/.editorconfig ‎.editorconfig

File renamed without changes.

‎.php_cs.dist

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?php
2+
3+
/**
4+
* This file represents the configuration for Code Sniffing PSR-2-related
5+
* automatic checks of coding guidelines
6+
* Install @fabpot's great php-cs-fixer tool via
7+
*
8+
* $ composer global require friendsofphp/php-cs-fixer
9+
*
10+
* And then simply run
11+
*
12+
* $ php-cs-fixer fix
13+
*
14+
* For more information read:
15+
* http://www.php-fig.org/psr/psr-2/
16+
* http://cs.sensiolabs.org
17+
*/
18+
19+
if (PHP_SAPI !== 'cli') {
20+
die('This script supports command line usage only. Please check your command.');
21+
}
22+
23+
$header = <<<EOF
24+
This file is part of the package startpiloten/startpilot.
25+
26+
For the full copyright and license information, please read the
27+
LICENSE file that was distributed with this source code.
28+
EOF;
29+
30+
return PhpCsFixer\Config::create()
31+
->setRiskyAllowed(true)
32+
->setRules([
33+
'@PSR2' => true,
34+
'general_phpdoc_annotation_remove' => [
35+
'author'
36+
],
37+
'no_leading_import_slash' => true,
38+
'no_trailing_comma_in_singleline_array' => true,
39+
'no_singleline_whitespace_before_semicolons' => true,
40+
'no_unused_imports' => true,
41+
'concat_space' => ['spacing' => 'one'],
42+
'no_whitespace_in_blank_line' => true,
43+
'ordered_imports' => true,
44+
'single_quote' => true,
45+
'no_empty_statement' => true,
46+
'no_extra_consecutive_blank_lines' => true,
47+
'phpdoc_no_package' => true,
48+
'phpdoc_scalar' => true,
49+
'no_blank_lines_after_phpdoc' => true,
50+
'array_syntax' => ['syntax' => 'short'],
51+
'whitespace_after_comma_in_array' => true,
52+
'function_typehint_space' => true,
53+
'hash_to_slash_comment' => true,
54+
'no_alias_functions' => true,
55+
'lowercase_cast' => true,
56+
'no_leading_namespace_whitespace' => true,
57+
'native_function_casing' => true,
58+
'self_accessor' => true,
59+
'no_short_bool_cast' => true,
60+
'no_unneeded_control_parentheses' => true
61+
])
62+
->setFinder(
63+
PhpCsFixer\Finder::create()
64+
->exclude('.build')
65+
->exclude('Contrib')
66+
->in(__DIR__)
67+
);

‎Classes/ViewHelpers/Format/DateViewHelper.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* With Type Config
1515
* {dateObject -> s:format.date(type:'medium')}
1616
*
17-
* <s:format.date type="long">{dateObject}</ma:format.date>
17+
* <s:format.date type="long">{dateObject}</s:format.date>
1818
*
1919
*
2020
* = Required TypoScript-Configuration =
@@ -28,13 +28,11 @@
2828
* }
2929
* }
3030
*/
31-
3231
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
3332

3433
/**
3534
* Class DateViewHelper
3635
*
37-
* @package Vendor\Yourext\ViewHelpers\Format
3836
*/
3937
class DateViewHelper extends AbstractViewHelper
4038
{
@@ -78,11 +76,12 @@ public function render($date = null, $type = null)
7876

7977
if (!$date instanceof \DateTime) {
8078
try {
81-
$date = is_integer($date) ? new \DateTime('@' . $date) : new \DateTime($date);
79+
$date = is_int($date) ? new \DateTime('@' . $date) : new \DateTime($date);
8280
$date->setTimezone(new \DateTimeZone(date_default_timezone_get()));
8381
} catch (\Exception $exception) {
8482
throw new \Exception(
85-
'"' . $date . '" could not be parsed by \DateTime constructor.', 1241722579
83+
'"' . $date . '" could not be parsed by \DateTime constructor.',
84+
1241722579
8685
);
8786
}
8887
}

‎Configuration/TCA/tt_content.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
'before'
1414
);
1515

16-
$global_fields = array();
16+
$global_fields = [];
1717

1818
ExtensionManagementUtility::addTCAcolumns('tt_content', $global_fields);
1919

‎Configuration/TCA/tt_content_textimage.php

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
/**
33
* Startpilot Content Element | startpilot_textimage
44
*/
5-
65
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
76

87
/***************

‎Configuration/TypoScript/constants.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ googleanalytics =
3030
# customsubcategory=300=Meta
3131
page.meta {
3232
# cat=startpilot: Meta/400/100; type=string; label=viewport
33-
viewport = user-scalable=yes, width=device-width, initial-scale=1
33+
viewport = width=device-width, initial-scale=1, shrink-to-fit=no
3434
# cat=startpilot: Meta/400/110; type=string; label=robots
3535
robots = index,follow
3636
# cat=startpilot: Meta/400/120; type=string; label=apple-mobile-web-app-capable

‎Resources/Build/Assets/JavaScript/main.js

+3-11
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,10 @@
22
* Load jQuery into global `$` for plugin usage
33
* @type {jQuery}
44
*/
5-
window.$ = window.jQuery = require('jquery/dist/jquery');
5+
window.$ = window.jQuery = require('jquery');
6+
window.Popper = require('popper.js'); // Bootstrap 4-beta.2 dependencies
67

7-
/**
8-
* Load Popper into global for plugin usage
9-
* @type {Popper}
10-
*/
11-
window.Popper = require('popper.js');
12-
13-
/**
14-
* Load Bootstrap
15-
*/
16-
require('bootstrap');
8+
require('bootstrap'); // Bootstrap
179

1810
/**
1911
* Say hello

‎Resources/Build/Assets/Scss/base/_b-bootstrap-variables.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
//
33
// Colors
44
//
5-
$white: $color-white;
6-
$black: $color-black;
5+
$white: $color-white;
6+
$black: $color-black;

‎Resources/Build/Assets/Scss/main.scss

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
@import "../../node_modules/bootstrap/scss/buttons";
2424
@import "../../node_modules/bootstrap/scss/nav";
2525
@import "../../node_modules/bootstrap/scss/navbar";
26+
@import "../../node_modules/bootstrap/scss/transitions";
2627

2728
// utilities
2829
//@import "../../node_modules/bootstrap/scss/utilities/flex";

‎Resources/Build/gulpfile.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ gulp.task('watch', function () {
3030
log('blue', 'File ' + destFilePath + ' deleted.');
3131
del.sync(destFilePath, { force: true });
3232
}
33-
}
33+
};
3434

3535
const syncDel = function(src) {
3636
if(path.basename(src) != '.DS_Store') {
@@ -42,7 +42,7 @@ gulp.task('watch', function () {
4242
log('blue', 'File ' + destFilePath + ' deleted.');
4343
del.sync(destFilePath, { force: true });
4444
}
45-
}
45+
};
4646

4747

4848
// watch styles
@@ -84,5 +84,5 @@ gulp.task('watch', function () {
8484

8585

8686
gulp.task('build', gulp.series('clean', 'css', 'fonts', 'misc', 'ckeditor', 'image', 'javascript'));
87-
gulp.task('ci', gulp.series('css:lint', 'javascript:lint'));
87+
gulp.task('ci', gulp.series('css:format', 'css:lint', 'javascript:lint'));
8888
gulp.task('default', gulp.series('build', gulp.parallel('watch')));

‎Resources/Build/package-lock.json

+8-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Resources/Build/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "startpilot",
3-
"version": "0.0.1",
3+
"version": "1.0.3",
44
"private": true,
55
"main": "Gulpfile.js",
66
"dependencies": {
7-
"bootstrap": "^4.0.0-beta",
7+
"bootstrap": "^4.0.0-beta.2",
88
"jquery": "^3.2.1",
99
"popper.js": "^1.12.0"
1010
},
@@ -36,7 +36,7 @@
3636
"gutil-color-log": "^1.0.2",
3737
"path": "^0.12.7",
3838
"vinyl-buffer": "^1.0.0",
39-
"vinyl-source-stream": "^1.1.0"
39+
"vinyl-source-stream": "^2.0.0"
4040
},
4141
"config": {
4242
"path": {

‎Resources/Private/ContentElements/Partials/ImageRender.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656

5757
<f:comment>
5858
<!---Render Image with custom sizes--->
59-
<f:render partial="PictureSrcset" arguments="{file:image, min1480:1920,max1479:1479,max1279:1279,max991:991,max767:767,max480:480,max375:375,fallbackWidth:1480}" />
59+
<f:render partial="ImageRender" arguments="{file:image, min1480:1920,max1479:1479,max1279:1279,max991:991,max767:767,max480:480,max375:375,fallbackWidth:1480}" />
6060
<!---Render Image with default sizes--->
61-
<f:render partial="PictureSrcset" arguments="{file:image}" />
62-
</f:comment>
61+
<f:render partial="ImageRender" arguments="{file:image}" />
62+
</f:comment>

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Vendor/Yourext",
33
"description": "TYPO3 Provider Extension",
44
"type": "typo3-cms-extension",
5-
"version": "1.0.2",
5+
"version": "1.0.3",
66
"require": {
77
"typo3/cms": "^8.7.7"
88
},

‎ext_emconf.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<?php
22

3-
$EM_CONF[$_EXTKEY] = array(
3+
$EM_CONF[$_EXTKEY] = [
44
'title' => 'TYPO3 Provider Extension',
55
'description' => '',
66
'category' => 'templates',
7-
'version' => '1.0.0',
7+
'version' => '1.0.3',
88
'state' => 'stable',
99
'clearcacheonload' => 1,
1010
'author' => 'Boris Schauer, Analog, Medienagenten',
1111
'author_email' => '[email protected], [email protected], [email protected]',
1212
'author_company' => '',
1313
'generator' => 'startpilot',
14-
'constraints' => array(
15-
'depends' => array(
14+
'constraints' => [
15+
'depends' => [
1616
'typo3' => '8.7.*',
1717
'rte_ckeditor' => '8.7.*'
18-
),
19-
'conflicts' => array(
18+
],
19+
'conflicts' => [
2020
'fluidpages' => '*',
2121
'themes' => '*',
22-
),
23-
),
24-
);
22+
],
23+
],
24+
];

‎ext_localconf.php

-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
88

99
if (TYPO3_MODE === 'BE') {
10-
1110
$iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
1211
\TYPO3\CMS\Core\Imaging\IconRegistry::class
1312
);
@@ -125,10 +124,8 @@
125124
if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$_EXTKEY])) {
126125
$GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$_EXTKEY] = serialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$_EXTKEY]);
127126
}
128-
129127
}
130128

131-
132129
/***************
133130
* Install Tool Settings
134131
*/

‎readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Startpilot - Typo3 provider extension with some basics
1+
# Startpilot - TYPO3 provider extension with some basics
22

33

44
## How to use:

0 commit comments

Comments
 (0)