Skip to content
This repository was archived by the owner on Dec 11, 2017. It is now read-only.

Commit 4d7e4f9

Browse files
committed
Update
1 parent d322f8d commit 4d7e4f9

File tree

10 files changed

+52
-34
lines changed

10 files changed

+52
-34
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*.*~
1414
/web/images/categories/
1515
/web/images/item-photos/
16-
/web/uploads/media/images/
16+
/web/uploads/media/*
1717
!/web/images/categories/.gitkeep
1818
!/web/images/item-photos/.gitkeep
19-
!/web/uploads/media/images/.gitkeep
19+
!/web/uploads/media/.gitkeep

.scrutinizer.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
checks:
2+
php:
3+
code_rating: true
4+
duplication: true
5+
16
filter:
27
excluded_paths: [vendor/*]
38

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Web-service for announcements of lost and found things.
77

88
[![Scrutinizer Quality Score](https://img.shields.io/scrutinizer/g/stfalcon-studio/lost-and-found.svg?style=flat-square)](https://scrutinizer-ci.com/g/stfalcon-studio/lost-and-found/)
99
[![Build Status](https://img.shields.io/travis/stfalcon-studio/lost-and-found.svg?style=flat-square)](https://travis-ci.org/stfalcon-studio/lost-and-found)
10-
[![Codecov](https://img.shields.io/codecov/c/github/stfalcon-studio/lost-and-found.svg?style=flat-square)](https://codecov.io/github/stfalcon-studio/lost-and-found?branch=develop)
10+
[![Codecov](https://img.shields.io/codecov/c/github/stfalcon-studio/lost-and-found.svg?style=flat-square)](https://codecov.io/github/stfalcon-studio/lost-and-found?branch=master)
1111
[![Total Downloads](https://img.shields.io/packagist/dt/stfalcon-studio/lost-and-found.svg?style=flat-square)](https://packagist.org/packages/stfalcon-studio/lost-and-found)
1212
[![Latest Stable Version](https://img.shields.io/packagist/v/stfalcon-studio/lost-and-found.svg?style=flat-square)](https://packagist.org/packages/stfalcon-studio/lost-and-found)
1313
[![License](https://img.shields.io/packagist/l/stfalcon-studio/lost-and-found.svg?style=flat-square)](https://packagist.org/packages/stfalcon-studio/lost-and-found)

app.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"repository": "https://github.com/stfalcon-studio/lost-and-found",
1515
"logo": "http://icons.iconarchive.com/icons/icons-land/vista-map-markers/256/Map-Marker-Marker-Outside-Azure-icon.png",
1616
"addons": [
17-
"cleardb"
17+
"heroku-postgresql"
1818
],
1919
"env": {
2020
"SYMFONY_ENV": {
@@ -28,6 +28,6 @@
2828
}
2929
},
3030
"scripts": {
31-
"postdeploy": "php app/console doctrine:migration:migrate"
31+
"postdeploy": "php app/console doctrine:schema:create; php app/console doctrine:schema:update --force"
3232
}
3333
}

app/config/sonata/sonata-media.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,23 @@ sonata_media:
1010
providers:
1111
- sonata.media.provider.image
1212
formats: ~
13+
pdf:
14+
providers:
15+
- sonata.media.provider.file
16+
formats: ~
1317
cdn:
1418
server:
1519
path: /uploads/media
1620
filesystem:
1721
local:
18-
directory: %kernel.root_dir%/../web/uploads/media
19-
create: false
22+
directory: %kernel.root_dir%/../web/uploads/media
23+
create: false
24+
providers:
25+
file:
26+
service: sonata.media.provider.file
27+
resizer: false
28+
filesystem: sonata.media.filesystem.local
29+
cdn: sonata.media.cdn.server
30+
generator: sonata.media.generator.default
31+
allowed_extensions: ['pdf']
32+
allowed_mime_types: ['application/pdf', 'application/x-pdf']

app/phpunit.xml.dist

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
>
1010
<testsuites>
1111
<testsuite name="Lost and Found Test Suite">
12-
<directory>../src/*/*Bundle/Tests</directory>
13-
<directory>../src/*/Bundle/*Bundle/Tests</directory>
1412
<directory>../src/*Bundle/Tests</directory>
1513
</testsuite>
1614
</testsuites>
@@ -25,12 +23,9 @@
2523
<whitelist>
2624
<directory>../src</directory>
2725
<exclude>
26+
<directory>../src/*Bundle/DataFixtures</directory>
2827
<directory>../src/*Bundle/Resources</directory>
2928
<directory>../src/*Bundle/Tests</directory>
30-
<directory>../src/*/*Bundle/Resources</directory>
31-
<directory>../src/*/*Bundle/Tests</directory>
32-
<directory>../src/*/Bundle/*Bundle/Resources</directory>
33-
<directory>../src/*/Bundle/*Bundle/Tests</directory>
3429
</exclude>
3530
</whitelist>
3631
</filter>

composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"require": {
4040
"php": ">=5.4.0",
4141
"ext-intl": "*",
42+
"ext-gd": "*",
4243
"ext-mbstring": "*",
4344
"symfony/symfony": "2.6.*",
4445
"doctrine/orm": "~2.4",
@@ -53,7 +54,7 @@
5354
"doctrine/migrations": "dev-master",
5455
"doctrine/doctrine-migrations-bundle": "dev-master",
5556
"stof/doctrine-extensions-bundle": "1.2.*@dev",
56-
"fresh/doctrine-enum-bundle": "v3.1",
57+
"fresh/doctrine-enum-bundle": "v3.2",
5758
"sonata-project/doctrine-orm-admin-bundle": "2.3.0",
5859
"sonata-project/seo-bundle": "1.1.*@dev",
5960
"egeloen/ckeditor-bundle": "~3.0",
@@ -122,6 +123,7 @@
122123
"incenteev-parameters": {
123124
"file": "app/config/parameters.yml",
124125
"env_map": {
126+
"database_driver": "SYMFONY__DATABASE_DRIVER",
125127
"database_name": "SYMFONY__DATABASE_NAME",
126128
"database_user": "SYMFONY__DATABASE_USER",
127129
"database_host": "SYMFONY__DATABASE_HOST",

composer.lock

Lines changed: 19 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/AppBundle/Composer/HerokuEnvironment.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@ class HerokuEnvironment
1919
*/
2020
public static function populateEnvironment(Event $event)
2121
{
22-
$url = getenv('CLEARDB_DATABASE_URL');
22+
$url = getenv('HEROKU_POSTGRESQL_IVORY_URL');
2323

2424
if ($url) {
2525
$url = parse_url($url);
26+
putenv("SYMFONY__DATABASE_DRIVER=pdo_pgsql");
2627
putenv("SYMFONY__DATABASE_HOST={$url['host']}");
2728
putenv("SYMFONY__DATABASE_USER={$url['user']}");
2829
putenv("SYMFONY__DATABASE_PASSWORD={$url['pass']}");
@@ -33,9 +34,9 @@ public static function populateEnvironment(Event $event)
3334

3435
$io = $event->getIO();
3536

36-
$databaseUrl = getenv('CLEARDB_DATABASE_URL');
37+
$databaseUrl = getenv('HEROKU_POSTGRESQL_IVORY_URL');
3738
if (!empty($databaseUrl)) {
38-
$io->write('CLEARDB_DATABASE_URL=' . $databaseUrl);
39+
$io->write('HEROKU_POSTGRESQL_IVORY_URL=' . $databaseUrl);
3940
}
4041
}
4142
}

0 commit comments

Comments
 (0)