Skip to content

Commit 34d200a

Browse files
committed
Prepare next version with all SF 4 changes
1 parent a479131 commit 34d200a

File tree

157 files changed

+5857
-4164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+5857
-4164
lines changed

.env

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# This file is a "template" of which env vars need to be defined for your application
2+
# Copy this file to .env file for development, create environment variables when deploying to production
3+
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
4+
5+
###> symfony/framework-bundle ###
6+
APP_ENV=dev
7+
APP_SECRET=9d27ae2fee5cdce7eb45d7aba490cfcb
8+
#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
9+
#TRUSTED_HOSTS=localhost,example.com
10+
###< symfony/framework-bundle ###
11+
12+
###> symfony/swiftmailer-bundle ###
13+
# For Gmail as a transport, use: "gmail://username:password@localhost"
14+
# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode="
15+
# Delivery is disabled by default via "null://localhost"
16+
MAILER_URL=null://localhost
17+
###< symfony/swiftmailer-bundle ###
18+
19+
###> doctrine/doctrine-bundle ###
20+
# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
21+
# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
22+
# Configure your db driver and server_version in config/packages/doctrine.yaml
23+
DATABASE_URL=mysql://db_user:[email protected]:3306/db_name
24+
###< doctrine/doctrine-bundle ###

.env.dist

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# This file is a "template" of which env vars need to be defined for your application
2+
# Copy this file to .env file for development, create environment variables when deploying to production
3+
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
4+
5+
###> symfony/framework-bundle ###
6+
APP_ENV=dev
7+
APP_SECRET=9d27ae2fee5cdce7eb45d7aba490cfcb
8+
#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
9+
#TRUSTED_HOSTS=localhost,example.com
10+
###< symfony/framework-bundle ###
11+
12+
###> symfony/swiftmailer-bundle ###
13+
# For Gmail as a transport, use: "gmail://username:password@localhost"
14+
# For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode="
15+
# Delivery is disabled by default via "null://localhost"
16+
MAILER_URL=null://localhost
17+
###< symfony/swiftmailer-bundle ###
18+
19+
###> doctrine/doctrine-bundle ###
20+
# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
21+
# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
22+
# Configure your db driver and server_version in config/packages/doctrine.yaml
23+
DATABASE_URL=mysql://db_user:[email protected]:3306/db_name
24+
###< doctrine/doctrine-bundle ###

.gitignore

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
1-
/app/config/parameters.yml
2-
/build/
3-
/phpunit.xml
4-
/var/*
5-
!/var/cache
6-
/var/cache/*
7-
!var/cache/.gitkeep
8-
!/var/logs
9-
/var/logs/*
10-
!var/logs/.gitkeep
11-
!/var/sessions
12-
/var/sessions/*
13-
!var/sessions/.gitkeep
14-
!var/SymfonyRequirements.php
1+
2+
###> symfony/framework-bundle ###
3+
.env
4+
/public/bundles/
5+
/var/
156
/vendor/
16-
/web/bundles/
7+
###< symfony/framework-bundle ###
8+
9+
###> symfony/phpunit-bridge ###
10+
.phpunit
11+
/phpunit.xml
12+
###< symfony/phpunit-bridge ###
1713

18-
/app/config/phpcr.yml
19-
/jackrabbit/
20-
/jackrabbit-standalone-*.jar
21-
/vagrant/.vagrant
14+
vagrant/.vagrant
15+
/config/phpcr.yaml

.platform.app.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ build:
1919
# The configuration of app when it is exposed to the web.
2020
web:
2121
# The public directory of the app, relative to its root.
22-
document_root: "/web"
22+
document_root: "/public"
2323
# The front-controller script to send non-static requests to.
24-
passthru: "/app.php"
24+
passthru: "/index.php"
2525
whitelist:
2626
# slides
2727
- ^/slides/.*\.html$
@@ -58,9 +58,8 @@ mounts:
5858
# The hooks that will be performed when the package is deployed.
5959
hooks:
6060
build: |
61-
rm web/app_dev.php
6261
# place sqlite file into /tmp so that we can write to it during deploy
63-
sed -i 's@%kernel.root_dir%/../var/app.sqlite@/tmp/app.sqlite@' app/config/parameters.yml
62+
sed -i 's@%kernel.project_dir%/var/app.sqlite@/tmp/app.sqlite@' app/config/parameters.yml
6463
bin/console --env=prod assets:install -n --no-debug
6564
bin/console --env=prod assetic:dump -n --no-debug
6665
deploy: ./bin/reloadFixtures.sh $PWD true

.sensiolabs.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,17 @@
55

66
global_exclude_dirs:
77
- vendor
8-
- web
9-
- app/tests
8+
- public
9+
- tests
1010
- vagrant
1111
- bin
1212

1313
pre_composer_script: |
1414
#!/bin/bash
1515
16-
cp app/config/parameters.yml.dist app/config/parameters.yml
17-
cp app/config/phpcr_doctrine_dbal.yml.dist app/config/phpcr.yml
16+
cp config/fixtures/parameters.yml.dist config/packages/parameters.yml
17+
cp config/fixtures/phpcr_doctrine_dbal.yml.dist config/packages/phpcr.yml
1818
19-
exclude_patterns:
20-
- app/autoload.php
21-
- app/check.php
22-
- app/SymfonyRequirements.php
2319
2420
rules:
2521
symfony.web_config_should_not_be_present:

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ before_install:
3434
install:
3535
- phpenv config-add travis.php.ini
3636
- php -ini | grep memory_limit
37-
- if [ "$COMPOSER_INSTALL" != "1" ]; then composer update --no-scripts --prefer-dist; else composer install --no-scripts --prefer-dist; fi
37+
- if [ "$COMPOSER_INSTALL" != "1" ]; then composer update --no-scripts --prefer-dist -vvv; else composer install --no-scripts --prefer-dist -vvv; fi
3838

3939
before_script:
40-
- cp app/config/phpcr_${TRANSPORT}.yml.dist app/config/phpcr.yml
40+
- cp config/fixtures/phpcr_${TRANSPORT}.yaml.dist config/phpcr.yaml
4141
- composer run-script post-update-cmd
4242
- ./tests/travis_${TRANSPORT}.sh
4343
- bin/console doctrine:phpcr:workspace:create sandbox_test -e=test

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ You can run the sandbox on your system, or in a virtualbox VM using Vagrant. For
1818

1919
### You will need:
2020

21-
* PHP 5.3.9+ (with intl extension)
21+
* PHP 7.1+ (with intl extension)
2222
* PHPUnit 3.6+ (optional)
2323
* Composer
2424

@@ -43,11 +43,11 @@ implementation.
4343
Once you have that, copy the default jackalope-jackrabbit configuration file,
4444
adjust it as needed and install the dependencies with composer:
4545

46-
cp app/config/phpcr_jackrabbit.yml.dist app/config/phpcr.yml
46+
cp config/fixtures/phpcr_jackrabbit.yml.dist config/packages/phpcr.yml
4747

4848
The last command will fetch the main project and all its dependencies (CMF
4949
Bundles, Symfony, Doctrine\PHPCR, Jackalope ... ). You might want to have a look
50-
at the ``app/config/parameters.yml`` and adjust as needed.
50+
at the ``config/packages/phpcr.yml`` and adjust as needed.
5151

5252
### Install the Doctrine DBAL provider (optional)
5353

@@ -56,7 +56,7 @@ files and create the database accordingly. If you have the PHP sqlite extension
5656
available, this is the simplest to quickly try out the CMF. Copy the file
5757
and then install the dependencies:
5858

59-
cp app/config/phpcr_doctrine_dbal.yml.dist app/config/phpcr.yml
59+
cp config/fixtures/phpcr_doctrine_dbal.yml.dist config/packages/phpcr.yml
6060

6161
The Doctrine DBAL implementation is installed by default already along side the Jackrabbit implementation.
6262

@@ -110,7 +110,7 @@ Create an apache virtual host entry along the lines of:
110110

111111
<Virtualhost *:80>
112112
Servername cmf.lo
113-
DocumentRoot /path/to/symfony-cmf/cmf-sandbox/web
113+
DocumentRoot /path/to/symfony-cmf/cmf-sandbox/public
114114
<Directory /path/to/symfony-cmf/cmf-sandbox>
115115
AllowOverride All
116116
</Directory>

app/.htaccess

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/AppCache.php

Lines changed: 0 additions & 18 deletions
This file was deleted.

app/AppKernel.php

Lines changed: 0 additions & 108 deletions
This file was deleted.

0 commit comments

Comments
 (0)