Skip to content

Commit

Permalink
Updated composer packages to include the security component, removed …
Browse files Browse the repository at this point in the history
…speed test from our default phpunit.xml file, removed stray reference to tags
  • Loading branch information
chartjes committed Feb 15, 2017
1 parent 9b58bb0 commit b212989
Show file tree
Hide file tree
Showing 4 changed files with 311 additions and 237 deletions.
3 changes: 0 additions & 3 deletions classes/Http/Controller/TalkController.php
Expand Up @@ -178,9 +178,6 @@ public function editAction(Request $req)
'slides' => $talk_info['slides'],
'other' => $talk_info['other'],
'sponsor' => $talk_info['sponsor'],
'tags' => array_reduce($talk_info['tags'], function ($response, array $item) {
return (strlen($response) > 0) ? $response . ', ' . $item['tag'] : $item['tag'];
}),
'buttonInfo' => 'Update my talk!',
];

Expand Down
9 changes: 5 additions & 4 deletions composer.json
Expand Up @@ -10,9 +10,9 @@
"cartalyst/sentry": "2.1.*",
"doctrine/dbal": "~2.3",
"ezyang/htmlpurifier": "dev-master",
"guzzlehttp/guzzle": "~6.2",
"illuminate/container": "4.0.*@dev",
"illuminate/database": "4.0.*@dev",
"guzzlehttp/guzzle": "~6.2",
"illuminate/events": "4.0.*@dev",
"illuminate/support": "4.0.*@dev",
"intervention/image": "1.5.*",
Expand All @@ -29,6 +29,7 @@
"symfony/css-selector": "~3.2",
"symfony/form": "~3.2",
"symfony/intl": "~3.2",
"symfony/security": "~3.2",
"symfony/security-csrf": "~3.2",
"symfony/translation": "~3.2",
"symfony/twig-bridge": "~3.2",
Expand All @@ -41,10 +42,10 @@
"codeclimate/php-test-reporter": "0.2.0",
"friendsofphp/php-cs-fixer": "^2.0.0",
"fzaninotto/faker": "^1.5.0",
"johnkary/phpunit-speedtrap": "~1.0@dev",
"johnkary/phpunit-speedtrap": "2.0.x-dev",
"mockery/mockery": "1.0.*@dev",
"phpunit/dbunit": "1.3.2",
"phpunit/phpunit": "^4.8",
"phpunit/phpunit": "~6.0",
"phpunit/phpunit-mock-objects": "~4.0",
"satooshi/php-coveralls": "~0.6"
},
"autoload": {
Expand Down

0 comments on commit b212989

Please sign in to comment.