Skip to content

Commit

Permalink
Merge bebd9c4 into 8fda15c
Browse files Browse the repository at this point in the history
  • Loading branch information
jaapio committed Apr 29, 2018
2 parents 8fda15c + bebd9c4 commit 2cd2ed8
Show file tree
Hide file tree
Showing 190 changed files with 7,343 additions and 6,630 deletions.
10 changes: 10 additions & 0 deletions .env
@@ -0,0 +1,10 @@
# This file is a "template" of which env vars need to be defined for your application
# Copy this file to .env file for development, create environment variables when deploying to production
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration

###> symfony/framework-bundle ###
APP_ENV=dev
APP_SECRET=3f48b02b6f8e6ad6e8c07d0b03762d31
#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
#TRUSTED_HOSTS=localhost,example.com
###< symfony/framework-bundle ###
10 changes: 10 additions & 0 deletions .env.dist
@@ -0,0 +1,10 @@
# This file is a "template" of which env vars need to be defined for your application
# Copy this file to .env file for development, create environment variables when deploying to production
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration

###> symfony/framework-bundle ###
APP_ENV=dev
APP_SECRET=3f48b02b6f8e6ad6e8c07d0b03762d31
#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
#TRUSTED_HOSTS=localhost,example.com
###< symfony/framework-bundle ###
5 changes: 5 additions & 0 deletions .gitignore
Expand Up @@ -17,6 +17,11 @@ bin/validate-json*
build/*
vendor/*
composer.phar
var/*

# By default the phpunit.xml.dist is provided; you can override this using a local config file
phpunit.xml

###> phpunit/phpunit ###
/phpunit.xml
###< phpunit/phpunit ###
4 changes: 1 addition & 3 deletions .travis.yml
Expand Up @@ -33,10 +33,8 @@ jobs:
php: 7.1
services:
- docker
before_script:
- composer create-project symplify/easy-coding-standard temp/ecs
script:
- temp/ecs/bin/ecs check src tests
- docker-compose run --rm ecs
- docker-compose run --rm phpstan

- stage: release
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Expand Up @@ -13,9 +13,9 @@ branches:

environment:
matrix:
- PHP_VERSION: '7.1.16'
- PHP_VERSION: '7.1.17'
VC_VERSION: 'VC14'
- PHP_VERSION: '7.2.4'
- PHP_VERSION: '7.2.5'
VC_VERSION: 'VC15'
matrix:
fast_finish: false
Expand Down
43 changes: 43 additions & 0 deletions bin/console
@@ -0,0 +1,43 @@
#!/usr/bin/env php
<?php

use App\Kernel;
use Doctrine\Common\Annotations\AnnotationRegistry;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Input\ArgvInput;
use Symfony\Component\Debug\Debug;
use Symfony\Component\Dotenv\Dotenv;

set_time_limit(0);

$loader = require __DIR__.'/../vendor/autoload.php';

AnnotationRegistry::registerLoader([$loader, 'loadClass']);

if (!class_exists(Application::class)) {
throw new \RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
}

if (!isset($_SERVER['APP_ENV'])) {
if (!class_exists(Dotenv::class)) {
throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
}
(new Dotenv())->load(__DIR__.'/../.env');
}

$input = new ArgvInput();
$env = $input->getParameterOption(['--env', '-e'], $_SERVER['APP_ENV'] ?? 'dev');
$debug = ($_SERVER['APP_DEBUG'] ?? ('prod' !== $env)) && !$input->hasParameterOption(['--no-debug', '']);

if ($debug) {
umask(0000);

if (class_exists(Debug::class)) {
Debug::enable();
}
}

$kernel = new Kernel($env, $debug);
$application = new Application($kernel);
$application->setDefaultCommand('project:run');
$application->run($input);
1 change: 1 addition & 0 deletions bin/php-parse
66 changes: 41 additions & 25 deletions bin/phpdoc 100755 → 100644
@@ -1,27 +1,43 @@
#!/usr/bin/env php
<?php
/**
* phpDocumentor
*
* PHP Version 5.3
*
* @copyright 2010-2013 Mike van Riel / Naenius (http://www.naenius.com)
* @license http://www.opensource.org/licenses/mit-license.php MIT
* @link http://phpdoc.org
*/

// determine base include folder, if @php_dir@ contains @php_dir then
// we did not install via PEAR
$bootstrap_folder = (strpos('@php_dir@', '@php_dir') === 0)
? __DIR__ . '/../src'
: '@php_dir@/phpDocumentor/src';

include $bootstrap_folder . '/phpDocumentor/Bootstrap.php';

$app = \phpDocumentor\Bootstrap::createInstance()
->registerProfiler()
->initialize();
$app->run();

// disable E_STRICT reporting on the end to prevent PEAR from throwing Strict warnings.
error_reporting(error_reporting() & ~E_STRICT);

use App\Kernel;
use Doctrine\Common\Annotations\AnnotationRegistry;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Input\ArgvInput;
use Symfony\Component\Debug\Debug;
use Symfony\Component\Dotenv\Dotenv;

set_time_limit(0);

$loader = require __DIR__.'/../vendor/autoload.php';

AnnotationRegistry::registerLoader([$loader, 'loadClass']);

if (!class_exists(Application::class)) {
throw new \RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
}

if (!isset($_SERVER['APP_ENV'])) {
if (!class_exists(Dotenv::class)) {
throw new \RuntimeException('APP_ENV environment variable is not defined. You need to define environment variables for configuration or add "symfony/dotenv" as a Composer dependency to load variables from a .env file.');
}
(new Dotenv())->load(__DIR__.'/../.env');
}

$input = new ArgvInput();
$env = $input->getParameterOption(['--env', '-e'], $_SERVER['APP_ENV'] ?? 'prod');
$debug = ($_SERVER['APP_DEBUG'] ?? ('prod' !== $env)) && !$input->hasParameterOption(['--no-debug', '']);

if ($debug) {
umask(0000);

if (class_exists(Debug::class)) {
Debug::enable();
}
}

$kernel = new Kernel($env, $debug);
$application = new Application($kernel);
$application->setDefaultCommand('project:run');
$application->run($input);
108 changes: 67 additions & 41 deletions composer.json
Expand Up @@ -6,13 +6,11 @@
"license": "MIT",
"autoload": {
"psr-4": {
"phpDocumentor\\": [
"src/phpDocumentor/"
],
"Cilex\\" : [
"src/Cilex/"
]
}
"Cilex\\" : [ "src/phpDocumentor/Application/CilexCompatibilityLayer" ],
"Pimple\\" : [ "src/phpDocumentor/Application/CilexCompatibilityLayer" ],
"phpDocumentor\\": [ "src/phpDocumentor/" ]
},
"files": [ "src/Kernel.php" ]
},
"autoload-dev": {
"psr-4": {
Expand All @@ -25,40 +23,44 @@
}
},
"require": {
"php": ">=7.1",

"cilex/cilex": "^2.0",
"symfony/console": "~2.3",

"monolog/monolog": "~1.6",
"twig/twig": "~1.3",
"php": ">=7.1.3",
"ext-iconv": "*",
"erusev/parsedown": "~1.0",
"symfony/process": "~2.0",
"zetacomponents/document": ">=1.3.1",

"symfony/event-dispatcher": "~2.1",
"symfony/stopwatch": "~2.3",
"symfony/config": "~2.3",
"jms/serializer": ">=0.12 < 1.8.0",

"zendframework/zend-stdlib": "~2.1",
"zendframework/zend-servicemanager": "~2.1",
"zendframework/zend-config": "~2.1",
"zendframework/zend-i18n": "~2.1",
"zendframework/zend-serializer": "~2.1",
"zendframework/zend-cache": "~2.1",
"zendframework/zend-filter": "~2.1",

"phpdocumentor/graphviz": "~1.0",
"phpdocumentor/fileset": "~1.0",
"phpdocumentor/reflection": "dev-develop@dev",
"webmozart/assert": "^1.2",
"jms/serializer-bundle": "^2.3",
"league/pipeline": "^0.3.0",
"monolog/monolog": "~1.6",
"padraic/phar-updater": "^1.0",
"phpdocumentor/flyfinder": "@beta",
"phpdocumentor/graphviz": "~1.0",
"phpdocumentor/reflection": "dev-develop@dev",
"sensio/framework-extra-bundle": "^5.1",
"symfony/console": "^4.0",
"symfony/event-dispatcher": "^4.0",
"symfony/flex": "^1.0",
"symfony/framework-bundle": "^4.0",
"symfony/lts": "^4@dev",
"symfony/monolog-bundle": "^3.1",
"symfony/process": "^4.0",
"symfony/proxy-manager-bridge": "^4.0",
"symfony/stopwatch": "^4.0",
"symfony/var-dumper": "^4.0",
"symfony/yaml": "^4.0",
"tedivm/stash": "^0.14.2",
"phpdocumentor/flyfinder": "@beta"
"twig/twig": "~1.3",
"webmozart/assert": "^1.2",
"zendframework/zend-cache": "~2.1",
"zendframework/zend-config": "~2.1",
"zendframework/zend-filter": "~2.1",
"zendframework/zend-i18n": "~2.1",
"zendframework/zend-serializer": "~2.1",
"zendframework/zend-servicemanager": "~2.1",
"zendframework/zend-stdlib": "~2.1",
"zetacomponents/document": ">=1.3.1"
},
"minimum-stability": "stable",
"require-dev": {
"symfony/dotenv": "^4.0",

"behat/behat": "^3.0",
"phpunit/phpunit": "^6.4",
"mockery/mockery": "^1.0",
Expand All @@ -71,18 +73,42 @@
"ext-xslcache": "Enabling the XSLCache extension improves the generation of xml based templates."
},
"config": {
"bin-dir":"bin/"
"bin-dir":"bin/",
"preferred-install": {
"*": "dist"
},
"sort-packages": true
},
"replace": {
"symfony/polyfill-iconv": "*",
"symfony/polyfill-php71": "*",
"symfony/polyfill-php70": "*",
"symfony/polyfill-php56": "*"
},
"bin": ["bin/phpdoc.php", "bin/phpdoc"],
"scripts": {
"auto-scripts": {
"cache:clear": "symfony-cmd",
"assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd"
},
"post-install-cmd": [
"@auto-scripts"
],
"post-update-cmd": [
"@auto-scripts"
]
},
"conflict": {
"symfony/symfony": "*"
},
"extra": {
"branch-alias": {
"dev-develop": "3.0-dev",
"dev-master": "2.9.x-dev"
}
},
"scripts": {
"auto-scripts": {

},
"symfony": {
"id": "01C32VS9393M1CP9R8TEJMH62G",
"allow-contrib": false
}
}
}

0 comments on commit 2cd2ed8

Please sign in to comment.