Merge branch 'release/1.0.3'

.php_cs.dist

@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * This file represents the configuration for Code Sniffing PSR-2-related
+ * automatic checks of coding guidelines
+ * Install @fabpot's great php-cs-fixer tool via
+ *
+ *  $ composer global require friendsofphp/php-cs-fixer
+ *
+ * And then simply run
+ *
+ *  $ php-cs-fixer fix
+ *
+ * For more information read:
+ *  http://www.php-fig.org/psr/psr-2/
+ *  http://cs.sensiolabs.org
+ */
+
+if (PHP_SAPI !== 'cli') {
+    die('This script supports command line usage only. Please check your command.');
+}
+
+$header = <<<EOF
+This file is part of the package startpiloten/startpilot.
+
+For the full copyright and license information, please read the
+LICENSE file that was distributed with this source code.
+EOF;
+
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2' => true,
+        'general_phpdoc_annotation_remove' => [
+            'author'
+        ],
+        'no_leading_import_slash' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_unused_imports' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'no_whitespace_in_blank_line' => true,
+        'ordered_imports' => true,
+        'single_quote' => true,
+        'no_empty_statement' => true,
+        'no_extra_consecutive_blank_lines' => true,
+        'phpdoc_no_package' => true,
+        'phpdoc_scalar' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'whitespace_after_comma_in_array' => true,
+        'function_typehint_space' => true,
+        'hash_to_slash_comment' => true,
+        'no_alias_functions' => true,
+        'lowercase_cast' => true,
+        'no_leading_namespace_whitespace' => true,
+        'native_function_casing' => true,
+        'self_accessor' => true,
+        'no_short_bool_cast' => true,
+        'no_unneeded_control_parentheses' => true
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->exclude('.build')
+            ->exclude('Contrib')
+            ->in(__DIR__)
+    );

Classes/ViewHelpers/Format/DateViewHelper.php

@@ -14,7 +14,7 @@
  * With Type Config
  * {dateObject -> s:format.date(type:'medium')}
  *
- * <s:format.date type="long">{dateObject}</ma:format.date>
+ * <s:format.date type="long">{dateObject}</s:format.date>
  *
  *
  * = Required TypoScript-Configuration =
@@ -28,13 +28,11 @@
  *    }
  * }
  */
-
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
 
 /**
  * Class DateViewHelper
  *
- * @package Vendor\Yourext\ViewHelpers\Format
  */
 class DateViewHelper extends AbstractViewHelper
 {
@@ -78,11 +76,12 @@ public function render($date = null, $type = null)
 
         if (!$date instanceof \DateTime) {
             try {
-                $date = is_integer($date) ? new \DateTime('@' . $date) : new \DateTime($date);
+                $date = is_int($date) ? new \DateTime('@' . $date) : new \DateTime($date);
                 $date->setTimezone(new \DateTimeZone(date_default_timezone_get()));
             } catch (\Exception $exception) {
                 throw new \Exception(
-                    '"' . $date . '" could not be parsed by \DateTime constructor.', 1241722579
+                    '"' . $date . '" could not be parsed by \DateTime constructor.',
+                    1241722579
                 );
             }
         }

Configuration/TCA/tt_content.php

@@ -13,7 +13,7 @@
     'before'
 );
 
-$global_fields = array();
+$global_fields = [];
 
 ExtensionManagementUtility::addTCAcolumns('tt_content', $global_fields);
 

Configuration/TCA/tt_content_textimage.php

@@ -2,7 +2,6 @@
 /**
  * Startpilot Content Element | startpilot_textimage
  */
-
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
 /***************

Configuration/TypoScript/constants.txt

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

Resources/Build/Assets/JavaScript/main.js

@@ -2,18 +2,10 @@
  * Load jQuery into global `$` for plugin usage
  * @type {jQuery}
  */
-window.$ = window.jQuery = require('jquery/dist/jquery');
+window.$ = window.jQuery = require('jquery');
+window.Popper = require('popper.js'); // Bootstrap 4-beta.2 dependencies
 
-/**
- * Load Popper into global for plugin usage
- * @type {Popper}
- */
-window.Popper = require('popper.js');
-
-/**
- * Load Bootstrap
- */
-require('bootstrap');
+require('bootstrap'); // Bootstrap
 
 /**
  * Say hello

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

@@ -2,5 +2,5 @@
 //
 // Colors
 //
-$white:  $color-white;
-$black:  $color-black;
+$white: $color-white;
+$black: $color-black;

Resources/Build/Assets/Scss/main.scss

@@ -23,6 +23,7 @@
 @import "../../node_modules/bootstrap/scss/buttons";
 @import "../../node_modules/bootstrap/scss/nav";
 @import "../../node_modules/bootstrap/scss/navbar";
+@import "../../node_modules/bootstrap/scss/transitions";
 
 // utilities
 //@import "../../node_modules/bootstrap/scss/utilities/flex";

Resources/Build/gulpfile.js

@@ -30,7 +30,7 @@ gulp.task('watch', function () {
             log('blue', 'File ' + destFilePath + ' deleted.');
             del.sync(destFilePath, { force: true });
         }
-    }
+    };
 
     const syncDel = function(src) {
         if(path.basename(src) != '.DS_Store') {
@@ -42,7 +42,7 @@ gulp.task('watch', function () {
             log('blue', 'File ' + destFilePath + ' deleted.');
             del.sync(destFilePath, { force: true });
         }
-    }
+    };
 
 
     // watch styles
@@ -84,5 +84,5 @@ gulp.task('watch', function () {
 
 
 gulp.task('build', gulp.series('clean', 'css', 'fonts', 'misc', 'ckeditor', 'image', 'javascript'));
-gulp.task('ci', gulp.series('css:lint', 'javascript:lint'));
+gulp.task('ci', gulp.series('css:format', 'css:lint', 'javascript:lint'));
 gulp.task('default', gulp.series('build', gulp.parallel('watch')));

Resources/Build/package.json

@@ -1,10 +1,10 @@
 {
   "name": "startpilot",
-  "version": "0.0.1",
+  "version": "1.0.3",
   "private": true,
   "main": "Gulpfile.js",
   "dependencies": {
-    "bootstrap": "^4.0.0-beta",
+    "bootstrap": "^4.0.0-beta.2",
     "jquery": "^3.2.1",
     "popper.js": "^1.12.0"
   },
@@ -36,7 +36,7 @@
     "gutil-color-log": "^1.0.2",
     "path": "^0.12.7",
     "vinyl-buffer": "^1.0.0",
-    "vinyl-source-stream": "^1.1.0"
+    "vinyl-source-stream": "^2.0.0"
   },
   "config": {
     "path": {

Resources/Private/ContentElements/Partials/ImageRender.html

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

composer.json

@@ -2,7 +2,7 @@
   "name": "Vendor/Yourext",
   "description": "TYPO3 Provider Extension",
   "type": "typo3-cms-extension",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "require": {
     "typo3/cms": "^8.7.7"
   },

ext_emconf.php

@@ -1,24 +1,24 @@
 <?php
 
-$EM_CONF[$_EXTKEY] = array(
+$EM_CONF[$_EXTKEY] = [
     'title' => 'TYPO3 Provider Extension',
     'description' => '',
     'category' => 'templates',
-    'version' => '1.0.0',
+    'version' => '1.0.3',
     'state' => 'stable',
     'clearcacheonload' => 1,
     'author' => 'Boris Schauer, Analog, Medienagenten',
     'author_email' => '[email protected], [email protected], [email protected]',
     'author_company' => '',
     'generator' => 'startpilot',
-    'constraints' => array(
-        'depends' => array(
+    'constraints' => [
+        'depends' => [
             'typo3' => '8.7.*',
             'rte_ckeditor' => '8.7.*'
-        ),
-        'conflicts' => array(
+        ],
+        'conflicts' => [
             'fluidpages' => '*',
             'themes' => '*',
-        ),
-    ),
-);
+        ],
+    ],
+];

ext_localconf.php

@@ -7,7 +7,6 @@
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
 if (TYPO3_MODE === 'BE') {
-
     $iconRegistry = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
         \TYPO3\CMS\Core\Imaging\IconRegistry::class
     );
@@ -125,10 +124,8 @@
     if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$_EXTKEY])) {
         $GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$_EXTKEY] = serialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$_EXTKEY]);
     }
-
 }
 
-
 /***************
  * Install Tool Settings
  */

readme.md

@@ -1,4 +1,4 @@
-# Startpilot - Typo3 provider extension with some basics
+# Startpilot - TYPO3 provider extension with some basics
 
 
 ## How to use: