Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
hhit
config-generator
Commits
0c3008e8
Commit
0c3008e8
authored
Mar 02, 2021
by
Hendrik Heneke
Browse files
Switched back to standalone application and renamed package.
parent
604bc534
Pipeline
#367
passed with stage
in 18 seconds
Changes
49
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
125 additions
and
86 deletions
+125
-86
src/ConfigGeneratorBundle.php
src/ConfigGeneratorBundle.php
+0
-10
src/ContaoManager/ConfigGeneratorPlugin.php
src/ContaoManager/ConfigGeneratorPlugin.php
+0
-17
src/DependencyInjection/ConfigGeneratorExtension.php
src/DependencyInjection/ConfigGeneratorExtension.php
+0
-22
src/Generator/Compiler/Compiler.php
src/Generator/Compiler/Compiler.php
+4
-4
src/Generator/Definition/Definition.php
src/Generator/Definition/Definition.php
+3
-3
src/Generator/Definition/DefinitionReader.php
src/Generator/Definition/DefinitionReader.php
+6
-6
src/Generator/Factory.php
src/Generator/Factory.php
+87
-0
src/Generator/Generator.php
src/Generator/Generator.php
+12
-11
src/Generator/IO/Directory.php
src/Generator/IO/Directory.php
+1
-1
src/Generator/IO/File.php
src/Generator/IO/File.php
+1
-1
src/Generator/IO/FileReader.php
src/Generator/IO/FileReader.php
+1
-1
src/Generator/IO/FileWriter.php
src/Generator/IO/FileWriter.php
+1
-1
src/Generator/IO/JsonReader.php
src/Generator/IO/JsonReader.php
+1
-1
src/Generator/IO/Path.php
src/Generator/IO/Path.php
+2
-2
src/Generator/Secrets/SecretProviderFactory.php
src/Generator/Secrets/SecretProviderFactory.php
+1
-1
src/Generator/Secrets/SecretProviderInterface.php
src/Generator/Secrets/SecretProviderInterface.php
+1
-1
src/Generator/Secrets/SymfonyVaultSecretProvider.php
src/Generator/Secrets/SymfonyVaultSecretProvider.php
+1
-1
src/Generator/StringUtils.php
src/Generator/StringUtils.php
+1
-1
src/Generator/Validator/JSONValidator.php
src/Generator/Validator/JSONValidator.php
+1
-1
src/Generator/Validator/ValidationException.php
src/Generator/Validator/ValidationException.php
+1
-1
No files found.
src/ConfigGeneratorBundle.php
deleted
100644 → 0
View file @
604bc534
<?php
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGeneratorBundle
;
use
Symfony\Component\HttpKernel\Bundle\Bundle
;
class
ConfigGeneratorBundle
extends
Bundle
{
}
src/ContaoManager/ConfigGeneratorPlugin.php
deleted
100644 → 0
View file @
604bc534
<?php
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGeneratorBundle\ContaoManager
;
use
Contao\ManagerPlugin\Bundle\BundlePluginInterface
;
use
Contao\ManagerPlugin\Bundle\Config\BundleConfig
;
use
Contao\ManagerPlugin\Bundle\Parser\ParserInterface
;
use
HHIT\ConfigGeneratorBundle\ConfigGeneratorBundle
;
class
ConfigGeneratorPlugin
implements
BundlePluginInterface
{
public
function
getBundles
(
ParserInterface
$parser
)
{
return
[
BundleConfig
::
create
(
ConfigGeneratorBundle
::
class
)];
}
}
src/DependencyInjection/ConfigGeneratorExtension.php
deleted
100644 → 0
View file @
604bc534
<?php
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGeneratorBundle\DependencyInjection
;
use
Symfony\Component\Config\FileLocator
;
use
Symfony\Component\DependencyInjection\ContainerBuilder
;
use
Symfony\Component\DependencyInjection\Extension\Extension
;
use
Symfony\Component\DependencyInjection\Loader\YamlFileLoader
;
class
ConfigGeneratorExtension
extends
Extension
{
public
function
load
(
array
$configs
,
ContainerBuilder
$container
)
{
$loader
=
new
YamlFileLoader
(
$container
,
new
FileLocator
(
__DIR__
.
'/../Resources/config'
)
);
$loader
->
load
(
'services.yaml'
);
}
}
src/Generator/Compiler/Compiler.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\Compiler
;
namespace
HHIT\ConfigGenerator\Generator\Compiler
;
use
HHIT\ConfigGenerator
Bundle
\Generator\IO\File
;
use
HHIT\ConfigGenerator\Generator\IO\File
;
use
HHIT\ConfigGenerator
Bundle
\Generator\IO\FileReader
;
use
HHIT\ConfigGenerator\Generator\IO\FileReader
;
use
HHIT\ConfigGenerator
Bundle
\Generator\Values\ValuesLoader
;
use
HHIT\ConfigGenerator\Generator\Values\ValuesLoader
;
use
LightnCandy\LightnCandy
;
use
LightnCandy\LightnCandy
;
class
Compiler
extends
FileReader
class
Compiler
extends
FileReader
...
...
src/Generator/Definition/Definition.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\Definition
;
namespace
HHIT\ConfigGenerator\Generator\Definition
;
use
HHIT\ConfigGenerator
Bundle
\Generator\IO\File
;
use
HHIT\ConfigGenerator\Generator\IO\File
;
use
HHIT\ConfigGenerator
Bundle
\Generator\IO\Path
;
use
HHIT\ConfigGenerator\Generator\IO\Path
;
class
Definition
class
Definition
{
{
...
...
src/Generator/Definition/DefinitionReader.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\Definition
;
namespace
HHIT\ConfigGenerator\Generator\Definition
;
use
HHIT\ConfigGenerator
Bundle
\Generator\IO\File
;
use
HHIT\ConfigGenerator\Generator\IO\File
;
use
HHIT\ConfigGenerator
Bundle
\Generator\IO\JsonReader
;
use
HHIT\ConfigGenerator\Generator\IO\JsonReader
;
use
HHIT\ConfigGenerator
Bundle
\Generator\IO\Path
;
use
HHIT\ConfigGenerator\Generator\IO\Path
;
use
HHIT\ConfigGenerator
Bundle
\Generator\IO\ReaderFactory
;
use
HHIT\ConfigGenerator\Generator\IO\ReaderFactory
;
use
HHIT\ConfigGenerator
Bundle
\Generator\StringUtils
;
use
HHIT\ConfigGenerator\Generator\StringUtils
;
class
DefinitionReader
class
DefinitionReader
{
{
...
...
src/Generator/Factory.php
0 → 100644
View file @
0c3008e8
<?php
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator\Generator
;
use
HHIT\ConfigGenerator\Generator\Definition\DefinitionReader
;
use
HHIT\ConfigGenerator\Generator\Secrets\SecretProviderFactory
;
use
HHIT\ConfigGenerator\Generator\Secrets\SymfonyVaultSecretProvider
;
use
HHIT\ConfigGenerator\Generator\Validator\ValidatorFactory
;
use
HHIT\ConfigGenerator\Generator\Values\ValuesLoaderFactory
;
use
Symfony\Bundle\FrameworkBundle\Secrets\DotenvVault
;
use
Symfony\Bundle\FrameworkBundle\Secrets\SodiumVault
;
use
Symfony\Component\Dotenv\Dotenv
;
class
Factory
{
private
string
$projectDir
;
private
string
$env
;
public
function
__construct
(
string
$projectDir
,
string
$env
=
'dev'
)
{
$this
->
projectDir
=
$projectDir
;
$this
->
env
=
$env
;
}
private
function
createDefinitionReader
():
DefinitionReader
{
return
new
DefinitionReader
(
$this
->
projectDir
);
}
function
createSodiumVault
():
SodiumVault
{
return
$this
->
createSodiumVaultInternal
(
$this
->
projectDir
.
'/config/secrets/'
.
$this
->
env
);
}
private
function
createSodiumVaultInternal
(
string
$secretsDir
,
$decryptionKey
=
null
):
SodiumVault
{
return
new
SodiumVault
(
$secretsDir
,
$decryptionKey
);
}
private
function
createDotenvVault
(
string
$dotenvFile
):
DotenvVault
{
return
new
DotenvVault
(
$dotenvFile
);
}
private
function
createSymfonyVaultSecretProvider
():
SymfonyVaultSecretProvider
{
return
new
SymfonyVaultSecretProvider
(
$this
->
createSodiumVault
(),
$this
->
createDotenvVault
(
$this
->
projectDir
.
'/.env'
)
);
}
private
function
createSecretProviderFactory
():
SecretProviderFactory
{
return
new
SecretProviderFactory
(
$this
->
createSymfonyVaultSecretProvider
());
}
private
function
createValuesLoaderFactory
():
ValuesLoaderFactory
{
return
new
ValuesLoaderFactory
(
$this
->
createSecretProviderFactory
());
}
private
function
createValidatorFactory
():
ValidatorFactory
{
return
new
ValidatorFactory
();
}
function
createGenerator
():
Generator
{
return
new
Generator
(
$this
->
createDefinitionReader
(),
$this
->
createValuesLoaderFactory
(),
$this
->
createValidatorFactory
(),
);
}
function
bootEnv
()
{
if
(
is_array
(
$env
=
@
include
$this
->
projectDir
.
'/.env.local.php'
)
&&
(
!
isset
(
$env
[
'APP_ENV'
])
||
(
$_SERVER
[
'APP_ENV'
]
??
$_ENV
[
'APP_ENV'
]
??
$env
[
'APP_ENV'
])
===
$env
[
'APP_ENV'
]))
{
(
new
Dotenv
(
false
))
->
populate
(
$env
);
}
else
{
(
new
Dotenv
(
false
))
->
loadEnv
(
$this
->
projectDir
.
'/.env'
);
}
}
}
src/Generator/Generator.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator
;
namespace
HHIT\ConfigGenerator\Generator
;
use
HHIT\ConfigGenerator
Bundle
\Generator\Compiler\Compiler
;
use
HHIT\ConfigGenerator\Generator\Compiler\Compiler
;
use
HHIT\ConfigGenerator
Bundle
\Generator\Definition\DefinitionReader
;
use
HHIT\ConfigGenerator\Generator\Definition\DefinitionReader
;
use
HHIT\ConfigGenerator
Bundle
\Generator\IO\FileWriter
;
use
HHIT\ConfigGenerator\Generator\IO\FileWriter
;
use
HHIT\ConfigGenerator
Bundle
\Generator\Definition\Definition
;
use
HHIT\ConfigGenerator\Generator\Definition\Definition
;
use
HHIT\ConfigGenerator
Bundle
\Generator\Validator\ValidationException
;
use
HHIT\ConfigGenerator\Generator\Validator\ValidationException
;
use
HHIT\ConfigGenerator
Bundle
\Generator\Validator\ValidatorFactory
;
use
HHIT\ConfigGenerator\Generator\Validator\ValidatorFactory
;
use
HHIT\ConfigGenerator
Bundle
\Generator\Values\ValuesLoaderFactory
;
use
HHIT\ConfigGenerator\Generator\Values\ValuesLoaderFactory
;
use
Symfony\Component\Console\Output\OutputInterface
;
use
Symfony\Component\Console\Output\OutputInterface
;
class
Generator
class
Generator
...
@@ -39,7 +39,7 @@ class Generator
...
@@ -39,7 +39,7 @@ class Generator
/**
/**
* @var $definition Definition
* @var $definition Definition
*/
*/
$this
->
writeln
(
$output
,
"<info>
P
rocessing
configuration
{
$definition
->
getId
()
}
</info>"
);
$this
->
writeln
(
$output
,
"<info>
- p
rocessing
{
$definition
->
getId
()
}
</info>"
);
try
{
try
{
$valuesLoader
=
$this
->
valuesLoaderFactory
->
create
(
$definition
->
getValuesFile
(),
$vaultType
);
$valuesLoader
=
$this
->
valuesLoaderFactory
->
create
(
$definition
->
getValuesFile
(),
$vaultType
);
...
@@ -50,14 +50,15 @@ class Generator
...
@@ -50,14 +50,15 @@ class Generator
$definition
->
getDestinationFile
()
->
parent
(
false
);
$definition
->
getDestinationFile
()
->
parent
(
false
);
$writer
=
new
FileWriter
(
$definition
->
getDestinationFile
());
$writer
=
new
FileWriter
(
$definition
->
getDestinationFile
());
$writer
->
write
(
$compiler
->
compile
(),
$overwrite
);
$writer
->
write
(
$compiler
->
compile
(),
$overwrite
);
$this
->
writeln
(
$output
,
"<info>-- configuration written to
{
$definition
->
getDestinationFile
()
->
asString
()
}
</info>"
);
$success
[]
=
true
;
$success
[]
=
true
;
}
catch
(
ValidationException
$ve
)
{
}
catch
(
ValidationException
$ve
)
{
$this
->
writeln
(
$output
,
"<error>generated content for
{
$definition
->
getId
()
}
is invalid:
{
$ve
->
getMessage
()
}
</error>"
);
$this
->
writeln
(
$output
,
"<error>
==
generated content for
{
$definition
->
getId
()
}
is invalid:
{
$ve
->
getMessage
()
}
</error>"
);
throw
$ve
;
throw
$ve
;
}
}
}
catch
(
\
Throwable
$t
)
{
}
catch
(
\
Throwable
$t
)
{
if
(
!
$t
instanceof
ValidationException
)
{
if
(
!
$t
instanceof
ValidationException
)
{
$this
->
writeln
(
$output
,
"<error>generating configuration file
{
$definition
->
getId
()
}
failed:
{
$t
->
getMessage
()
}
</error>"
);
$this
->
writeln
(
$output
,
"<error>
==
generating configuration file
{
$definition
->
getId
()
}
failed:
{
$t
->
getMessage
()
}
</error>"
);
}
}
$success
[]
=
false
;
$success
[]
=
false
;
}
}
...
...
src/Generator/IO/Directory.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\IO
;
namespace
HHIT\ConfigGenerator\Generator\IO
;
class
Directory
extends
Path
class
Directory
extends
Path
{
{
...
...
src/Generator/IO/File.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\IO
;
namespace
HHIT\ConfigGenerator\Generator\IO
;
class
File
extends
Path
class
File
extends
Path
{
{
...
...
src/Generator/IO/FileReader.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\IO
;
namespace
HHIT\ConfigGenerator\Generator\IO
;
class
FileReader
class
FileReader
{
{
...
...
src/Generator/IO/FileWriter.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\IO
;
namespace
HHIT\ConfigGenerator\Generator\IO
;
class
FileWriter
class
FileWriter
{
{
...
...
src/Generator/IO/JsonReader.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\IO
;
namespace
HHIT\ConfigGenerator\Generator\IO
;
class
JsonReader
extends
FileReader
class
JsonReader
extends
FileReader
{
{
...
...
src/Generator/IO/Path.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\IO
;
namespace
HHIT\ConfigGenerator\Generator\IO
;
use
HHIT\ConfigGenerator
Bundle
\Generator\StringUtils
;
use
HHIT\ConfigGenerator\Generator\StringUtils
;
abstract
class
Path
abstract
class
Path
{
{
...
...
src/Generator/Secrets/SecretProviderFactory.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\Secrets
;
namespace
HHIT\ConfigGenerator\Generator\Secrets
;
class
SecretProviderFactory
class
SecretProviderFactory
{
{
...
...
src/Generator/Secrets/SecretProviderInterface.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\Secrets
;
namespace
HHIT\ConfigGenerator\Generator\Secrets
;
interface
SecretProviderInterface
interface
SecretProviderInterface
{
{
...
...
src/Generator/Secrets/SymfonyVaultSecretProvider.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\Secrets
;
namespace
HHIT\ConfigGenerator\Generator\Secrets
;
use
Symfony\Bundle\FrameworkBundle\Secrets\DotenvVault
;
use
Symfony\Bundle\FrameworkBundle\Secrets\DotenvVault
;
use
Symfony\Bundle\FrameworkBundle\Secrets\SodiumVault
;
use
Symfony\Bundle\FrameworkBundle\Secrets\SodiumVault
;
...
...
src/Generator/StringUtils.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator
;
namespace
HHIT\ConfigGenerator\Generator
;
class
StringUtils
class
StringUtils
{
{
...
...
src/Generator/Validator/JSONValidator.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\Validator
;
namespace
HHIT\ConfigGenerator\Generator\Validator
;
class
JSONValidator
implements
ValidatorInterface
class
JSONValidator
implements
ValidatorInterface
{
{
...
...
src/Generator/Validator/ValidationException.php
View file @
0c3008e8
<?php
<?php
declare
(
strict_types
=
1
);
declare
(
strict_types
=
1
);
namespace
HHIT\ConfigGenerator
Bundle
\Generator\Validator
;
namespace
HHIT\ConfigGenerator\Generator\Validator
;
use
Throwable
;
use
Throwable
;
...
...
Prev
1
2
3
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment