Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
76 changes: 0 additions & 76 deletions .php-cs-fixer.dist.php

This file was deleted.

2 changes: 2 additions & 0 deletions Build/.php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
use PhpCsFixer\Finder;

return (new Config())
// Documentation code examples indent two spaces, see .editorconfig
->setIndent(' ')
->setFinder(
(new Finder())
->in(__DIR__.'/../Documentation')
Expand Down
26 changes: 13 additions & 13 deletions Documentation/Installation/_ApplicationContext/_additional-2.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
defined('TYPO3') or die();

$customChanges = [
'BE' => [
'debug' => '0',
],
'FE' => [
'debug' => '0',
],
'SYS' => [
'trustedHostsPattern' => 'SERVER_NAME', // keep this if it is working on your server
'devIPmask' => '127.0.0.1,::1', // localhost oly
'displayErrors' => 0, // Turn off error reporting
],
'BE' => [
'debug' => '0',
],
'FE' => [
'debug' => '0',
],
'SYS' => [
'trustedHostsPattern' => 'SERVER_NAME', // keep this if it is working on your server
'devIPmask' => '127.0.0.1,::1', // localhost oly
'displayErrors' => 0, // Turn off error reporting
],
];

$GLOBALS['TYPO3_CONF_VARS'] = array_replace_recursive($GLOBALS['TYPO3_CONF_VARS'], (array)$customChanges);
$file = realpath(__DIR__) . '/credentials.php';
if (is_file($file)) {
include_once($file);
$GLOBALS['TYPO3_CONF_VARS'] = array_replace_recursive($GLOBALS['TYPO3_CONF_VARS'], (array)$customChanges);
include_once($file);
$GLOBALS['TYPO3_CONF_VARS'] = array_replace_recursive($GLOBALS['TYPO3_CONF_VARS'], (array)$customChanges);
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
$GLOBALS['TYPO3_CONF_VARS'] = array_replace_recursive($GLOBALS['TYPO3_CONF_VARS'], (array)$customChanges);
$file = realpath(__DIR__) . '/credentials.php';
if (is_file($file)) {
include_once($file);
$GLOBALS['TYPO3_CONF_VARS'] = array_replace_recursive($GLOBALS['TYPO3_CONF_VARS'], (array)$customChanges);
include_once($file);
$GLOBALS['TYPO3_CONF_VARS'] = array_replace_recursive($GLOBALS['TYPO3_CONF_VARS'], (array)$customChanges);
}
30 changes: 15 additions & 15 deletions Documentation/Installation/_ApplicationContext/_credentials.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@

defined('TYPO3') or die();
$customChanges = [
'BE' => [
'installToolPassword' => 'some encrypted string',
],
'DB' => [
'Connections' => [
'Default' => [
'dbname' => 'my_db',
'host' => 'localhost',
'password' => '<secure password>',
'user' => 'my_db_user',
],
],
],
'SYS' => [
'encryptionKey' => 'replace with generated encryption key',
'BE' => [
'installToolPassword' => 'some encrypted string',
],
'DB' => [
'Connections' => [
'Default' => [
'dbname' => 'my_db',
'host' => 'localhost',
'password' => '<secure password>',
'user' => 'my_db_user',
],
],
],
'SYS' => [
'encryptionKey' => 'replace with generated encryption key',
],
];