Skip to content

Commit

Permalink
Restructure distribution
Browse files Browse the repository at this point in the history
  • Loading branch information
helhum committed May 12, 2017
1 parent 4cac7b6 commit a147f11
Show file tree
Hide file tree
Showing 11 changed files with 153 additions and 75 deletions.
38 changes: 0 additions & 38 deletions .env-example

This file was deleted.

49 changes: 49 additions & 0 deletions .env.dist
@@ -0,0 +1,49 @@
# @IgnoreInspection BashAddShebang
# Use "Development" to avoid TYPO3 caching and verbose error output
# Use "Production" for maximum performance and no error output
TYPO3_CONTEXT="Development"

# Installation automation
TYPO3_INSTALL_DB_USER="root"
TYPO3_INSTALL_DB_PASSWORD="root"
TYPO3_INSTALL_DB_HOST="localhost"
TYPO3_INSTALL_DB_PORT="3306"
TYPO3_INSTALL_DB_UNIX_SOCKET=""
# TYPO3_INSTALL_DB_DBNAME="your_database"

TYPO3_INSTALL_DB_USE_EXISTING="0"
# TYPO3_INSTALL_ADMIN_USER="admin"
# TYPO3_INSTALL_ADMIN_PASSWORD="password"
TYPO3_INSTALL_SITE_NAME="Awesome Distribution is awesome"
TYPO3_INSTALL_SITE_SETUP_TYPE="site"

# Set arbitrary TYPO3_CONF_VARS values, following the convention: TYPO3__<section>[__<sub-section>]__property

# Secrets
TYPO3__SYS__encryptionKey="doesnotmatteronlocaldev"
TYPO3__BE__installToolPassword='$P$C8.8X90tS2Djh1XOCTFehnh6Xu5uAp1' # joh316

# DB Credentials
TYPO3__DB__Connections__Default__user="${TYPO3_INSTALL_DB_USER}"
TYPO3__DB__Connections__Default__password="${TYPO3_INSTALL_DB_PASSWORD}"
TYPO3__DB__Connections__Default__host="${TYPO3_INSTALL_DB_HOST}"
TYPO3__DB__Connections__Default__port="${TYPO3_INSTALL_DB_PORT}"
TYPO3__DB__Connections__Default__dbname="${TYPO3_INSTALL_DB_DBNAME}"

## Site name
TYPO3__SYS__sitename="${TYPO3_INSTALL_SITE_NAME}"

# Host specifics
## path to image processing binary
TYPO3__GFX__processor_path="/opt/local/bin/"
TYPO3__GFX__processor_path_lzw="/opt/local/bin/"

## realurl/ hostnames
TYPO3__EXTCONF__site_configuration__domainNames__default="test.dev"
TYPO3__EXTCONF__site_configuration__domainNames__en="test.com.dev"

# optional values
TYPO3__BE__adminOnly="0"

# TYPO3 7.6 compatiblity
## TODO
68 changes: 37 additions & 31 deletions composer.json
@@ -1,57 +1,63 @@
{
"repositories": [
{ "type": "composer", "url": "https://composer.typo3.org/" }
{ "type": "composer", "url": "https://composer.typo3.org/" },
{ "type": "vcs", "url": "/Users/helmut/Developer/Console/typo3_console" },
{ "type": "path", "url": "packages/*" }
],
"name": "helhum/typo3-distribution",
"name": "helhum/awesome-typo3-distribution",
"description" : "TYPO3 CMS Distribution with console and .env support",
"license": "GPL-2.0+",
"require": {
"typo3/cms": "^7.6",
"typo3/cms": "^8.7",
"helhum/typo3-config-handling": "@dev",

"typo3/cms-belog": "^7.6",
"typo3/cms-beuser": "^7.6",
"typo3/cms-context-help": "^7.6",
"typo3/cms-fluid-styled-content": "^7.6",
"typo3/cms-felogin": "^7.6",
"typo3/cms-filelist": "^7.6",
"typo3/cms-impexp": "^7.6",
"typo3/cms-info": "^7.6",
"typo3/cms-info-pagetsconfig": "^7.6",
"typo3/cms-lowlevel": "^7.6",
"typo3/cms-reports": "^7.6",
"typo3/cms-rsaauth": "^7.6",
"typo3/cms-rtehtmlarea": "^7.6",
"typo3/cms-setup": "^7.6",
"typo3/cms-tstemplate": "^7.6",
"typo3/cms-viewpage": "^7.6",
"typo3/cms-belog": "^8.7",
"typo3/cms-beuser": "^8.7",
"typo3/cms-context-help": "^8.7",
"typo3/cms-fluid-styled-content": "^8.7",
"typo3/cms-felogin": "^8.7",
"typo3/cms-filelist": "^8.7",
"typo3/cms-impexp": "^8.7",
"typo3/cms-info": "^8.7",
"typo3/cms-info-pagetsconfig": "^8.7",
"typo3/cms-lowlevel": "^8.7",
"typo3/cms-reports": "^8.7",
"typo3/cms-rsaauth": "^8.7",
"typo3/cms-rte-ckeditor": "^8.7",
"typo3/cms-setup": "^8.7",
"typo3/cms-tstemplate": "^8.7",
"typo3/cms-viewpage": "^8.7",

"symfony/process": "~2.7.0",
"helhum/dotenv-connector": "^1.0.0",
"helhum/config-loader": "^0.1",
"helhum/typo3-console": "^4.0"
"helhum/typo3-console": "dev-master",
"roave/security-advisories": "dev-master"
},
"require-dev": {
"phpunit/phpunit": "^4.8.0",
"mikey179/vfsStream": "^1.6.0"
},
"autoload": {
"psr-4": {
"Helhum\\TYPO3\\Distribution\\": "src"
}
},
"scripts": {
"dot-env": [
"[ -f .env ] || cp .env.dist .env"
],
"package-states": [
"@php vendor/bin/typo3cms install:generatepackagestates"
"typo3cms install:generatepackagestates"
],
"folder-structure": [
"@php vendor/bin/typo3cms install:fixfolderstructure"
"typo3cms install:fixfolderstructure"
],
"extension-setup": [
"typo3cms install:extensionsetupifpossible"
],
"pre-deploy": [
"# Scripts here will be executed by Surf after composer install"
],
"pre-autoload-dump": [
"@dot-env"
],
"post-autoload-dump": [
"@package-states",
"@folder-structure"
"@folder-structure",
"@extension-setup"
]
},
"extra": {
Expand Down
47 changes: 47 additions & 0 deletions dynamicReturnTypeMeta.json
@@ -0,0 +1,47 @@
{
// configuration file for PHPStorm Plugin: http://plugins.jetbrains.com/plugin/7251
"methodCalls": [
{
"class": "\\TYPO3\\CMS\\Core\\Utility\\GeneralUtility",
"method": "makeInstance",
"position": 0
},
{
"class": "\\TYPO3\\CMS\\Extbase\\Object\\ObjectManagerInterface",
"method": "get",
"position": 0
},
{
"class": "\\PHPUnit_Framework_TestCase",
"method": "prophesize",
"position": 0,
"mask": "%s|\\Prophecy\\Prophecy\\ObjectProphecy"
},
{
"class": "\\PHPUnit_Framework_TestCase",
"method": "getMock",
"position": 0,
"mask": "%s|\\PHPUnit_Framework_MockObject_MockObject"
},
{
"class": "\\PHPUnit_Framework_TestCase",
"method": "createMock",
"position": 0,
"mask": "%s|\\PHPUnit_Framework_MockObject_MockObject"
},
{
"class": "\\TYPO3\\CMS\\Components\\TestingFramework\\Core\\BaseTestCase",
"method": "getAccessibleMock",
"position": 0,
"mask": "%s|\\PHPUnit_Framework_MockObject_MockObject|\\TYPO3\\CMS\\Components\\TestingFramework\\Core\\AccessibleObjectInterface"
},
{
"class": "\\TYPO3\\CMS\\Components\\TestingFramework\\Core\\BaseTestCase",
"method": "getAccessibleMockForAbstractClass",
"position": 0,
"mask": "%s|\\PHPUnit_Framework_MockObject_MockObject|\\TYPO3\\CMS\\Components\\TestingFramework\\Core\\AccessibleObjectInterface"
}
],
"functionCalls": [
]
}
14 changes: 14 additions & 0 deletions packages/typo3-config-handling/composer.json
@@ -0,0 +1,14 @@
{
"name": "helhum/typo3-config-handling",
"description" : "Configuration handling for TYPO3 CMS",
"license": "GPL-2.0+",
"require": {
"typo3/cms-core": "^7.6 || ^8.7",
"helhum/config-loader": "^0.1"
},
"autoload": {
"psr-4": {
"Helhum\\TYPO3\\ConfigHandling\\": "src"
}
}
}
@@ -1,5 +1,5 @@
<?php
namespace Helhum\TYPO3\Distribution;
namespace Helhum\TYPO3\ConfigHandling;

/**
* Class ConfigLoaderFactory
Expand Down
@@ -1,5 +1,5 @@
<?php
namespace Helhum\TYPO3\Distribution\Error;
namespace Helhum\TYPO3\ConfigHandling\Error;

use TYPO3\CMS\Core\Error\ExceptionHandlerInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility;
Expand Down
@@ -1,5 +1,5 @@
<?php
namespace Helhum\TYPO3\Distribution\Error;
namespace Helhum\TYPO3\ConfigHandling\Error;

/**
* A basic but solid exception handler which catches everything which
Expand Down
@@ -1,5 +1,5 @@
<?php
namespace Helhum\TYPO3\Distribution\Error;
namespace Helhum\TYPO3\ConfigHandling\Error;

use TYPO3\CMS\Core\Error\ErrorHandlerInterface;
use TYPO3\CMS\Core\Error\Exception;
Expand Down
@@ -1,5 +1,5 @@
<?php
namespace Helhum\TYPO3\Distribution\Error;
namespace Helhum\TYPO3\ConfigHandling\Error;

/**
* A quiet exception handler which catches but ignores any exception.
Expand Down
2 changes: 1 addition & 1 deletion web/typo3conf/AdditionalConfiguration.php
@@ -1,7 +1,7 @@
<?php
// We let the loader load context and environment specific configuration
// No other code must go in here!
$configLoader = \Helhum\TYPO3\Distribution\ConfigLoaderFactory::buildLoader(
$configLoader = \Helhum\TYPO3\ConfigHandling\ConfigLoaderFactory::buildLoader(
$context = \TYPO3\CMS\Core\Utility\GeneralUtility::getApplicationContext()->isProduction() ? 'production' : 'development',
$rootDir = dirname(dirname(__DIR__)),
$fixedCacheIdentifier = getenv('CONFIGURATION_CACHE_IDENTIFIER')
Expand Down

0 comments on commit a147f11

Please sign in to comment.