-# Cache and logs (Symfony2)
-/app/cache/*
-/app/logs/*
-!app/cache/.gitkeep
-!app/logs/.gitkeep
-
-# Cache and logs (Symfony3)
+# Cache, logs & sessions
+/var/*
+!/var/cache
/var/cache/*
-/var/logs/*
!var/cache/.gitkeep
+!/var/logs
+/var/logs/*
!var/logs/.gitkeep
+!/var/sessions
+/var/sessions/*
+!var/sessions/.gitkeep
+!var/SymfonyRequirements.php
# Parameters
/app/config/parameters.yml
-/app/config/parameters.ini
# Managed by Composer
-/app/bootstrap.php.cache
-/var/bootstrap.php.cache
-/bin/*
-!bin/console
-!bin/symfony_requirements
/vendor/
# Assets and user uploads
- if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
# disable xdebug since we don't use code-coverage for now
- if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi
- # build coverage only on one build, to speed up results feedbacks
- # - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; else PHPUNIT_FLAGS=""; fi;
- if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
script:
- ant prepare-$DB
- - SYMFONY_DEPRECATIONS_HELPER=weak bin/phpunit -v
-
-# after_script:
- # - |
- # if [ $TRAVIS_PHP_VERSION = '5.6' ]; then
- # wget https://scrutinizer-ci.com/ocular.phar
- # php ocular.phar code-coverage:upload --format=php-clover coverage.clover
- # fi
+ - bin/phpunit -v
-Copyright (c) 2013-2015 Nicolas Lœuillet\r
-\r
-Permission is hereby granted, free of charge, to any person obtaining a copy\r
-of this software and associated documentation files (the "Software"), to deal\r
-in the Software without restriction, including without limitation the rights\r
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
-copies of the Software, and to permit persons to whom the Software is furnished\r
-to do so, subject to the following conditions:\r
-\r
-The above copyright notice and this permission notice shall be included in all\r
-copies or substantial portions of the Software.\r
-\r
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\r
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
-THE SOFTWARE.\r
+Copyright (c) 2013-2016 Nicolas Lœuillet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
Thank you so much to [@tcitworld](https://github.com/tcitworld) and [@j0k3r](https://github.com/j0k3r).
-Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors
-).
+Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors).
```
composer create-project wallabag/wallabag wallabag 2.0.0-alpha.1
-cd wallabag
-php app/console wallabag:install
-php app/console server:run
+php bin/console wallabag:install
+php bin/console server:run
```
## License
-Copyright © 2013-2015 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2013-2016 Nicolas Lœuillet <nicolas@loeuillet.org>
This work is free. You can redistribute it and/or modify it under the
terms of the MIT License. See the COPYING file for more details.
<?php
-require_once __DIR__.'/AppKernel.php';
-
use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
class AppCache extends HttpCache
{
public function registerBundles()
{
- $bundles = array(
+ $bundles = [
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
new Symfony\Bundle\TwigBundle\TwigBundle(),
new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
new Wallabag\ImportBundle\WallabagImportBundle(),
new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
- );
+ ];
- if (in_array($this->getEnvironment(), array('dev', 'test'))) {
+ if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
$bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
return $bundles;
}
+ public function getRootDir()
+ {
+ return __DIR__;
+ }
+
+ public function getCacheDir()
+ {
+ return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
+ }
+
+ public function getLogDir()
+ {
+ return dirname(__DIR__).'/var/logs';
+ }
+
public function registerContainerConfiguration(LoaderInterface $loader)
{
- $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
+ $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
}
}
*/
$loader = require __DIR__.'/../vendor/autoload.php';
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
return $loader;
trusted_proxies: ~
session:
# handler_id set to null will use default session handler from php.ini
- handler_id: ~
+ handler_id: session.handler.native_file
+ save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%"
fragments: ~
http_method_override: true
+ assets: ~
wallabag_core:
languages:
warning_message: %warning_message%
paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
flattr_url: "https://flattr.com/thing/1265480"
- form:
- resources:
- - LexikFormFilterBundle:Form:form_div_layout.html.twig
+ form_themes:
+ - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
# Assetic Configuration
assetic:
autodetect_theme: wallabag_core.helper.detect_active_theme
path_patterns:
- # app_resource:
- # - %%app_path%%/views/themes/%%current_theme%%/%%template%%
- # - %%app_path%%/views/%%template%%
bundle_resource:
- %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
- # bundle_resource_dir:
- # - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
- # - %%dir%%/views/%%bundle_name%%/%%override_path%%
fos_user:
db_driver: orm
type: stream
path: "%kernel.logs_dir%/%kernel.environment%.log"
level: debug
+ channels: [!event]
console:
type: console
bubble: false
verbosity_levels:
VERBOSITY_VERBOSE: INFO
VERBOSITY_VERY_VERBOSE: DEBUG
- channels: ["!doctrine"]
+ channels: [!event, !doctrine]
console_very_verbose:
type: console
bubble: false
VERBOSITY_VERBOSE: NOTICE
VERBOSITY_VERY_VERBOSE: NOTICE
VERBOSITY_DEBUG: DEBUG
- channels: ["doctrine"]
- # uncomment to get logging in your browser
- # you may have to allow bigger header sizes in your Web server configuration
- #firephp:
- # type: firephp
- # level: info
- #chromephp:
- # type: chromephp
- # level: info
+ channels: [doctrine]
assetic:
use_controller: true
prefix: /
app:
- resource: @WallabagCoreBundle/Controller/
+ resource: "@WallabagCoreBundle/Controller/"
type: annotation
doc-api:
resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
prefix: /_profiler
-_configurator:
- resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
- prefix: /_configurator
-
_errors:
resource: "@TwigBundle/Resources/config/routing/errors.xml"
prefix: /_error
_main:
- resource: routing.yml
\ No newline at end of file
+ resource: routing.yml
# the main part of the security, where you can set up firewalls
# for specific sections of your app
firewalls:
+ # disables authentication for assets and the profiler, adapt it according to your needs
+ dev:
+ pattern: ^/(_(profiler|wdt)|css|images|js)/
+ security: false
+
oauth_token:
pattern: ^/oauth/v2/token
security: false
pattern: ^/
form_login:
provider: fos_userbundle
- csrf_provider: security.csrf.token_manager
+ csrf_token_generator: security.csrf.token_manager
anonymous: true
remember_me:
- key: "%secret%"
+ secret: "%secret%"
lifetime: 31536000
path: /
domain: ~
#!/usr/bin/env php
<?php
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Debug\Debug;
+
// if you don't want to setup permissions the proper way, just uncomment the following PHP line
// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
//umask(0000);
set_time_limit(0);
-require_once __DIR__.'/bootstrap.php.cache';
-require_once __DIR__.'/AppKernel.php';
-
-use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
+/**
+ * @var Composer\Autoload\ClassLoader $loader
+ */
+$loader = require __DIR__.'/../app/autoload.php';
$input = new ArgvInput();
-$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
-$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
+$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod';
if ($debug) {
Debug::enable();
--- /dev/null
+../vendor/doctrine/orm/bin/doctrine
\ No newline at end of file
--- /dev/null
+../vendor/doctrine/dbal/bin/doctrine-dbal
\ No newline at end of file
--- /dev/null
+../vendor/doctrine/migrations/bin/doctrine-migrations
\ No newline at end of file
--- /dev/null
+../vendor/doctrine/orm/bin/doctrine.php
\ No newline at end of file
--- /dev/null
+../vendor/sensiolabs/security-checker/security-checker
\ No newline at end of file
+#!/usr/bin/env php
<?php
-require_once dirname(__FILE__).'/SymfonyRequirements.php';
+require_once dirname(__FILE__).'/../var/SymfonyRequirements.php';
$lineSize = 70;
$symfonyRequirements = new SymfonyRequirements();
return;
}
- $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL;
+ $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL;
$errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL;
return $errorMessage;
echo PHP_EOL.PHP_EOL;
echo_style($style, str_repeat(' ', $width).PHP_EOL);
- echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
- echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
+ echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
+ echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
echo_style($style, str_repeat(' ', $width).PHP_EOL);
}
<target name="prepare-pgsql" depends="clean,composer,db_pgsql,prepare"/>
<target name="clean" description="Cleanup build artifacts">
- <delete dir="${basedir}/app/cache"/>
+ <delete dir="${basedir}/var/cache"/>
</target>
<target name="composer" description="Install deps using Composer">
<target name="prepare" description="Prepare for build">
<exec executable="php">
- <arg value="${basedir}/app/console"/>
+ <arg value="${basedir}/bin/console"/>
<arg value="doctrine:database:drop"/>
<arg value="--force"/>
<arg value="--env=test"/>
</exec>
<exec executable="php">
- <arg value="${basedir}/app/console"/>
+ <arg value="${basedir}/bin/console"/>
<arg value="doctrine:database:create"/>
<arg value="--env=test"/>
</exec>
<exec executable="php">
- <arg value="${basedir}/app/console"/>
+ <arg value="${basedir}/bin/console"/>
<arg value="doctrine:schema:create"/>
<arg value="--env=test"/>
</exec>
<exec executable="php">
- <arg value="${basedir}/app/console"/>
+ <arg value="${basedir}/bin/console"/>
<arg value="cache:clear"/>
<arg value="--env=test"/>
</exec>
<exec executable="php">
- <arg value="${basedir}/app/console"/>
+ <arg value="${basedir}/bin/console"/>
<arg value="doctrine:fixtures:load"/>
<arg value="--no-interaction"/>
<arg value="--env=test"/>
</exec>
<exec executable="php">
- <arg value="${basedir}/app/console"/>
+ <arg value="${basedir}/bin/console"/>
<arg value="cache:clear"/>
<arg value="--env=test"/>
</exec>
</exec>
<exec executable="php">
- <arg value="${basedir}/app/console"/>
+ <arg value="${basedir}/bin/console"/>
<arg value="cache:clear"/>
<arg value="--env=test"/>
</exec>
</exec>
<exec executable="php">
- <arg value="${basedir}/app/console"/>
+ <arg value="${basedir}/bin/console"/>
<arg value="cache:clear"/>
<arg value="--env=test"/>
</exec>
"issues": "https://github.com/wallabag/wallabag/issues"
},
"require": {
- "php": ">=5.5.0",
- "symfony/symfony": "~2.7.0",
- "doctrine/orm": "~2.3",
- "doctrine/doctrine-bundle": "1.5.2",
+ "php": ">=5.5.9",
+ "symfony/symfony": "3.0.*",
+ "doctrine/orm": "^2.5",
+ "doctrine/doctrine-bundle": "^1.6",
+ "doctrine/doctrine-cache-bundle": "^1.2",
"twig/extensions": "~1.0",
"symfony/assetic-bundle": "~2.3",
- "symfony/swiftmailer-bundle": "~2.3",
- "symfony/monolog-bundle": "~2.4",
- "sensio/distribution-bundle": "~3.0.12",
- "sensio/framework-extra-bundle": "~3.0",
- "incenteev/composer-parameter-handler": "~2.0",
+ "symfony/swiftmailer-bundle": "^2.3",
+ "symfony/monolog-bundle": "^2.8",
+ "sensio/distribution-bundle": "^5.0",
+ "sensio/framework-extra-bundle": "^3.0.2",
+ "incenteev/composer-parameter-handler": "^2.0",
"nelmio/cors-bundle": "~1.4.0",
"friendsofsymfony/rest-bundle": "~1.4",
- "jms/serializer-bundle": "~0.13",
+ "jms/serializer-bundle": "~1.0",
"nelmio/api-doc-bundle": "~2.7",
"ezyang/htmlpurifier": "~4.6",
"mgargano/simplehtmldom": "~1.5",
"tecnickcom/tcpdf": "~6.2",
"simplepie/simplepie": "~1.3.1",
- "willdurand/hateoas-bundle": "~0.5.0",
+ "willdurand/hateoas-bundle": "~1.0",
"htmlawed/htmlawed": "~1.1.19",
- "liip/theme-bundle": "~1.1.3",
+ "liip/theme-bundle": "~1.1",
"pagerfanta/pagerfanta": "~1.0.3",
- "lexik/form-filter-bundle": "~4.0",
+ "lexik/form-filter-bundle": "~5.0",
"j0k3r/graby": "~1.0",
"friendsofsymfony/user-bundle": "dev-master",
- "friendsofsymfony/oauth-server-bundle": "^1.4@dev",
+ "friendsofsymfony/oauth-server-bundle": "^1.5@dev",
"stof/doctrine-extensions-bundle": "^1.2@dev",
- "scheb/two-factor-bundle": "~1.4.0",
+ "scheb/two-factor-bundle": "~2.0",
"grandt/phpepub": "~4.0",
"wallabag/php-mobi": "~1.0.0",
"kphoen/rulerz-bundle": "~0.10",
"doctrine/doctrine-migrations-bundle": "^1.0"
},
"require-dev": {
- "doctrine/doctrine-fixtures-bundle": "~2.2.0",
- "sensio/generator-bundle": "~2.5",
+ "doctrine/doctrine-fixtures-bundle": "~2.2",
+ "sensio/generator-bundle": "^3.0",
"phpunit/phpunit": "~4.4",
- "symfony/phpunit-bridge": "~2.7.0"
+ "symfony/phpunit-bridge": "^2.7"
},
- "repositories": [
- {
- "type": "vcs",
- "url": "https://github.com/wallabag/phpMobi"
- }
- ],
"scripts": {
- "post-install-cmd": [
- "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
+ "build-parameters": [
+ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
],
- "post-update-cmd": [
- "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
+ "post-cmd": [
+ "@build-parameters",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
"Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
- "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
+ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
+ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
],
- "build-parameters": [
- "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
+ "post-install-cmd": [
+ "@post-cmd"
+ ],
+ "post-update-cmd": [
+ "@post-cmd"
]
},
"extra": {
"symfony-app-dir": "app",
+ "symfony-bin-dir": "bin",
+ "symfony-var-dir": "var",
"symfony-web-dir": "web",
+ "symfony-tests-dir": "tests",
"symfony-assets-install": "relative",
"incenteev-parameters": {
"file": "app/config/parameters.yml",
}
},
"autoload": {
- "psr-0": { "": "src/" }
+ "psr-4": { "": "src/" },
+ "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
},
"config": {
"bin-dir": "bin"
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "e738598a939db93e1c63d4aca980e42b",
- "content-hash": "19dffb1d7e701242746aea4ca17cebc2",
+ "hash": "084bbfd3166c16fd6bb6feb2c954a9da",
+ "content-hash": "9352d3c7f307a23d5fec42c350ea0653",
"packages": [
{
"name": "behat/transliterator",
},
{
"name": "doctrine/doctrine-bundle",
- "version": "v1.5.2",
+ "version": "1.6.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineBundle.git",
- "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3"
+ "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3",
- "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3",
+ "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b",
+ "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b",
"shasum": ""
},
"require": {
"orm",
"persistence"
],
- "time": "2015-08-31 14:47:06"
+ "time": "2015-11-16 17:11:46"
},
{
"name": "doctrine/doctrine-cache-bundle",
},
{
"name": "friendsofsymfony/oauth-server-bundle",
- "version": "1.4.2",
- "target-dir": "FOS/OAuthServerBundle",
+ "version": "1.5.0-BETA",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfSymfony/FOSOAuthServerBundle.git",
- "reference": "9e15c229eff547443d686445d629e9356ab0672e"
+ "reference": "a67c26e3a37cd6a63f75e2607418dd9247ed741b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfSymfony/FOSOAuthServerBundle/zipball/9e15c229eff547443d686445d629e9356ab0672e",
- "reference": "9e15c229eff547443d686445d629e9356ab0672e",
+ "url": "https://api.github.com/repos/FriendsOfSymfony/FOSOAuthServerBundle/zipball/a67c26e3a37cd6a63f75e2607418dd9247ed741b",
+ "reference": "a67c26e3a37cd6a63f75e2607418dd9247ed741b",
"shasum": ""
},
"require": {
- "friendsofsymfony/oauth2-php": "~1.1.0",
+ "friendsofsymfony/oauth2-php": "~1.1",
"php": ">=5.3.3",
- "symfony/framework-bundle": "~2.1",
- "symfony/security-bundle": "~2.1"
+ "symfony/framework-bundle": "~2.2|~3.0",
+ "symfony/security-bundle": "~2.1|~3.0"
},
"require-dev": {
"doctrine/doctrine-bundle": "~1.0",
- "doctrine/mongodb-odm": "1.0.*@dev",
- "doctrine/orm": ">=2.2,<2.5-dev",
- "symfony/class-loader": "~2.1",
- "symfony/yaml": "~2.1",
- "willdurand/propel-typehintable-behavior": "1.0.*"
+ "doctrine/mongodb-odm": "~1.0",
+ "doctrine/orm": "~2.2",
+ "phing/phing": "~2.4",
+ "propel/propel1": "^1.6.5",
+ "symfony/class-loader": "~2.1|~3.0",
+ "symfony/yaml": "~2.1|~3.0",
+ "willdurand/propel-typehintable-behavior": "^1.0.4"
},
"suggest": {
"doctrine/doctrine-bundle": "*",
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "1.4-dev"
+ "dev-master": "1.5-dev"
}
},
"autoload": {
- "psr-0": {
- "FOS\\OAuthServerBundle": ""
+ "psr-4": {
+ "FOS\\OAuthServerBundle\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"oauth2",
"server"
],
- "time": "2014-10-31 13:44:14"
+ "time": "2016-01-14 12:20:34"
},
{
"name": "friendsofsymfony/oauth2-php",
- "version": "1.1.1",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfSymfony/oauth2-php.git",
- "reference": "23e76537c4a02e666ab4ba5abe67a69a886a0310"
+ "reference": "4ae0a2aa85566146ef6f0f7169854c49e0c9243a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfSymfony/oauth2-php/zipball/23e76537c4a02e666ab4ba5abe67a69a886a0310",
- "reference": "23e76537c4a02e666ab4ba5abe67a69a886a0310",
+ "url": "https://api.github.com/repos/FriendsOfSymfony/oauth2-php/zipball/4ae0a2aa85566146ef6f0f7169854c49e0c9243a",
+ "reference": "4ae0a2aa85566146ef6f0f7169854c49e0c9243a",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
- "symfony/http-foundation": "~2.0"
+ "symfony/http-foundation": "~2.0|~3.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
"oauth",
"oauth2"
],
- "time": "2014-11-03 10:21:20"
+ "time": "2015-12-21 11:32:17"
},
{
"name": "friendsofsymfony/rest-bundle",
},
{
"name": "hoa/compiler",
- "version": "2.15.10.29",
+ "version": "3.16.01.14",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/Compiler.git",
- "reference": "ec0849fd3c1472fbcd86c3c961981f0cfe1f8d39"
+ "reference": "a1505e507e8368dbf7a5b490c4a5a90e06d7bd69"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/hoaproject/Compiler/zipball/ec0849fd3c1472fbcd86c3c961981f0cfe1f8d39",
- "reference": "ec0849fd3c1472fbcd86c3c961981f0cfe1f8d39",
+ "url": "https://api.github.com/repos/hoaproject/Compiler/zipball/a1505e507e8368dbf7a5b490c4a5a90e06d7bd69",
+ "reference": "a1505e507e8368dbf7a5b490c4a5a90e06d7bd69",
"shasum": ""
},
"require": {
- "hoa/core": "~2.0",
- "hoa/file": "~0.0",
- "hoa/iterator": "~1.0",
- "hoa/math": "~0.0",
- "hoa/regex": "~0.0",
- "hoa/visitor": "~1.0"
+ "hoa/consistency": "~1.0",
+ "hoa/exception": "~1.0",
+ "hoa/file": "~1.0",
+ "hoa/iterator": "~2.0",
+ "hoa/math": "~1.0",
+ "hoa/protocol": "~1.0",
+ "hoa/regex": "~1.0",
+ "hoa/visitor": "~2.0"
},
"require-dev": {
- "hoa/json": "~1.0",
- "hoa/test": "~1.0"
+ "hoa/json": "~2.0",
+ "hoa/test": "~2.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.x-dev"
+ "dev-master": "3.x-dev"
}
},
"autoload": {
"trace",
"uniform"
],
- "time": "2015-10-29 21:35:12"
+ "time": "2016-01-14 20:44:59"
},
{
- "name": "hoa/core",
- "version": "2.15.11.09",
+ "name": "hoa/consistency",
+ "version": "1.16.01.14",
"source": {
"type": "git",
- "url": "https://github.com/hoaproject/Core.git",
- "reference": "5538b1e90e2c66c90df5cc45e03fb85d047be900"
+ "url": "https://github.com/hoaproject/Consistency.git",
+ "reference": "7656b971a8248a8d314ed0c5bb0668936438f62a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/hoaproject/Core/zipball/5538b1e90e2c66c90df5cc45e03fb85d047be900",
- "reference": "5538b1e90e2c66c90df5cc45e03fb85d047be900",
+ "url": "https://api.github.com/repos/hoaproject/Consistency/zipball/7656b971a8248a8d314ed0c5bb0668936438f62a",
+ "reference": "7656b971a8248a8d314ed0c5bb0668936438f62a",
"shasum": ""
},
"require": {
- "ext-spl": "*",
- "php": ">=5.4.0"
+ "hoa/exception": "~1.0",
+ "php": ">=5.5.0"
},
"require-dev": {
- "hoa/test": "~1.0"
- },
- "suggest": {
- "ext-mbstring": "ext/mbstring must be present (or a third implementation).",
- "hoa/cli": "To use the `hoa` script."
+ "hoa/stream": "~0.0",
+ "hoa/test": "~2.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.x-dev"
+ "dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
- "Hoa\\Core\\": "."
+ "Hoa\\Consistency\\": "."
},
"files": [
- "Core.php"
+ "Prelude.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"homepage": "http://hoa-project.net/"
}
],
- "description": "The Hoa\\Core library.",
+ "description": "The Hoa\\Consistency library.",
"homepage": "http://hoa-project.net/",
"keywords": [
+ "autoloader",
+ "callable",
"consistency",
- "core",
- "data",
+ "entity",
+ "flex",
+ "keyword",
+ "library"
+ ],
+ "time": "2016-01-14 10:26:48"
+ },
+ {
+ "name": "hoa/event",
+ "version": "1.16.01.11",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/hoaproject/Event.git",
+ "reference": "4470e090207336c01ea0cc6f9f1fa8832e4d9866"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/hoaproject/Event/zipball/4470e090207336c01ea0cc6f9f1fa8832e4d9866",
+ "reference": "4470e090207336c01ea0cc6f9f1fa8832e4d9866",
+ "shasum": ""
+ },
+ "require": {
+ "hoa/consistency": "~1.0",
+ "hoa/exception": "~1.0"
+ },
+ "require-dev": {
+ "hoa/test": "~2.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Hoa\\Event\\": "."
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Ivan Enderlin",
+ "email": "ivan.enderlin@hoa-project.net"
+ },
+ {
+ "name": "Hoa community",
+ "homepage": "http://hoa-project.net/"
+ }
+ ],
+ "description": "The Hoa\\Event library.",
+ "homepage": "http://hoa-project.net/",
+ "keywords": [
"event",
"library",
"listener",
- "parameter",
- "protocol"
+ "observer"
+ ],
+ "time": "2016-01-11 08:34:41"
+ },
+ {
+ "name": "hoa/exception",
+ "version": "1.16.01.11",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/hoaproject/Exception.git",
+ "reference": "fa4a9648aef2c8ca8f4cd543429b24dc8feaa366"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/hoaproject/Exception/zipball/fa4a9648aef2c8ca8f4cd543429b24dc8feaa366",
+ "reference": "fa4a9648aef2c8ca8f4cd543429b24dc8feaa366",
+ "shasum": ""
+ },
+ "require": {
+ "hoa/consistency": "~1.0",
+ "hoa/event": "~1.0"
+ },
+ "require-dev": {
+ "hoa/test": "~2.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Hoa\\Exception\\": "."
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Ivan Enderlin",
+ "email": "ivan.enderlin@hoa-project.net"
+ },
+ {
+ "name": "Hoa community",
+ "homepage": "http://hoa-project.net/"
+ }
+ ],
+ "description": "The Hoa\\Exception library.",
+ "homepage": "http://hoa-project.net/",
+ "keywords": [
+ "exception",
+ "library"
],
- "time": "2015-11-09 06:51:06"
+ "time": "2016-01-11 08:38:17"
},
{
"name": "hoa/file",
- "version": "0.15.11.09",
+ "version": "1.16.01.15",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/File.git",
- "reference": "f46fe552ff79cb6c93a2ff9c25cfbc134fbd57ee"
+ "reference": "bc04ddb476bfeee03c2be585fc37a98d2887277b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/hoaproject/File/zipball/f46fe552ff79cb6c93a2ff9c25cfbc134fbd57ee",
- "reference": "f46fe552ff79cb6c93a2ff9c25cfbc134fbd57ee",
+ "url": "https://api.github.com/repos/hoaproject/File/zipball/bc04ddb476bfeee03c2be585fc37a98d2887277b",
+ "reference": "bc04ddb476bfeee03c2be585fc37a98d2887277b",
"shasum": ""
},
"require": {
- "hoa/core": "~2.0",
- "hoa/iterator": "~1.0",
- "hoa/stream": "~0.0"
+ "hoa/consistency": "~1.0",
+ "hoa/event": "~1.0",
+ "hoa/exception": "~1.0",
+ "hoa/iterator": "~2.0",
+ "hoa/stream": "~1.0"
},
"require-dev": {
- "hoa/test": "~1.0"
+ "hoa/test": "~2.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.x-dev"
+ "dev-master": "1.x-dev"
}
},
"autoload": {
"link",
"temporary"
],
- "time": "2015-11-09 06:55:20"
+ "time": "2016-01-14 20:55:07"
},
{
"name": "hoa/iterator",
- "version": "1.15.10.29",
+ "version": "2.16.01.11",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/Iterator.git",
- "reference": "a64ed9fd62579a34e4450134d6d1abdf77d54435"
+ "reference": "eed36f2ec8233f494fd4450d570453b9a84736da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/a64ed9fd62579a34e4450134d6d1abdf77d54435",
- "reference": "a64ed9fd62579a34e4450134d6d1abdf77d54435",
+ "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/eed36f2ec8233f494fd4450d570453b9a84736da",
+ "reference": "eed36f2ec8233f494fd4450d570453b9a84736da",
"shasum": ""
},
"require": {
- "hoa/core": "~2.0"
+ "hoa/consistency": "~1.0",
+ "hoa/exception": "~1.0"
},
"require-dev": {
- "hoa/test": "~1.0"
+ "hoa/test": "~2.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.x-dev"
+ "dev-master": "2.x-dev"
}
},
"autoload": {
"iterator",
"library"
],
- "time": "2015-10-29 21:37:16"
+ "time": "2016-01-11 09:13:46"
},
{
"name": "hoa/math",
- "version": "0.15.10.26",
+ "version": "1.16.01.15",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/Math.git",
- "reference": "62631c65d9a4f1b8bb4c4a3d6cdff0e8971d684e"
+ "reference": "218e6b4a42b66094e94cf9cbabf0a4276fece6bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/hoaproject/Math/zipball/62631c65d9a4f1b8bb4c4a3d6cdff0e8971d684e",
- "reference": "62631c65d9a4f1b8bb4c4a3d6cdff0e8971d684e",
+ "url": "https://api.github.com/repos/hoaproject/Math/zipball/218e6b4a42b66094e94cf9cbabf0a4276fece6bf",
+ "reference": "218e6b4a42b66094e94cf9cbabf0a4276fece6bf",
"shasum": ""
},
"require": {
- "hoa/compiler": "~2.0",
- "hoa/core": "~2.0",
- "hoa/iterator": "~1.0"
+ "hoa/compiler": "~3.0",
+ "hoa/consistency": "~1.0",
+ "hoa/exception": "~1.0",
+ "hoa/iterator": "~2.0",
+ "hoa/protocol": "~1.0",
+ "hoa/zformat": "~1.0"
},
"require-dev": {
- "hoa/test": "~1.0"
+ "hoa/test": "~2.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.x-dev"
+ "dev-master": "1.x-dev"
}
},
"autoload": {
"sampler",
"set"
],
- "time": "2015-10-26 15:22:52"
+ "time": "2016-01-14 21:02:22"
+ },
+ {
+ "name": "hoa/protocol",
+ "version": "1.16.01.11",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/hoaproject/Protocol.git",
+ "reference": "97a33357e9f0827b75e19a78429d037fab18c1ce"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/hoaproject/Protocol/zipball/97a33357e9f0827b75e19a78429d037fab18c1ce",
+ "reference": "97a33357e9f0827b75e19a78429d037fab18c1ce",
+ "shasum": ""
+ },
+ "require": {
+ "hoa/consistency": "~1.0",
+ "hoa/exception": "~1.0"
+ },
+ "require-dev": {
+ "hoa/test": "~2.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Hoa\\Protocol\\": "."
+ },
+ "files": [
+ "Wrapper.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Ivan Enderlin",
+ "email": "ivan.enderlin@hoa-project.net"
+ },
+ {
+ "name": "Hoa community",
+ "homepage": "http://hoa-project.net/"
+ }
+ ],
+ "description": "The Hoa\\Protocol library.",
+ "homepage": "http://hoa-project.net/",
+ "keywords": [
+ "library",
+ "protocol",
+ "resource",
+ "stream",
+ "wrapper"
+ ],
+ "time": "2016-01-11 08:41:20"
},
{
"name": "hoa/regex",
- "version": "0.15.08.13",
+ "version": "1.16.01.15",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/Regex.git",
- "reference": "2ef8a77ef3885ca202fcd9c31a8e54c44cd04232"
+ "reference": "e7fb36fdea23ea9fc814a1a68bd0144df1891463"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/hoaproject/Regex/zipball/2ef8a77ef3885ca202fcd9c31a8e54c44cd04232",
- "reference": "2ef8a77ef3885ca202fcd9c31a8e54c44cd04232",
+ "url": "https://api.github.com/repos/hoaproject/Regex/zipball/e7fb36fdea23ea9fc814a1a68bd0144df1891463",
+ "reference": "e7fb36fdea23ea9fc814a1a68bd0144df1891463",
"shasum": ""
},
"require": {
- "hoa/core": "~2.0",
- "hoa/math": "~0.0",
- "hoa/ustring": "~3.0",
- "hoa/visitor": "~1.0"
+ "hoa/consistency": "~1.0",
+ "hoa/exception": "~1.0",
+ "hoa/math": "~1.0",
+ "hoa/protocol": "~1.0",
+ "hoa/ustring": "~4.0",
+ "hoa/visitor": "~2.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.x-dev"
+ "dev-master": "1.x-dev"
}
},
"autoload": {
"library",
"regex"
],
- "time": "2015-08-13 06:48:47"
+ "time": "2016-01-14 21:10:33"
},
{
"name": "hoa/ruler",
- "version": "1.15.11.09",
+ "version": "2.16.01.15",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/Ruler.git",
- "reference": "9afc9ae032d40b6dc10bff85c9126cf516953925"
+ "reference": "0aeb1a48d78427a55fbf656c65c6406c096a4325"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/hoaproject/Ruler/zipball/9afc9ae032d40b6dc10bff85c9126cf516953925",
- "reference": "9afc9ae032d40b6dc10bff85c9126cf516953925",
+ "url": "https://api.github.com/repos/hoaproject/Ruler/zipball/0aeb1a48d78427a55fbf656c65c6406c096a4325",
+ "reference": "0aeb1a48d78427a55fbf656c65c6406c096a4325",
"shasum": ""
},
"require": {
- "hoa/compiler": "~2.0",
- "hoa/core": "~2.0",
- "hoa/file": "~0.0",
- "hoa/visitor": "~1.0"
+ "hoa/compiler": "~3.0",
+ "hoa/consistency": "~1.0",
+ "hoa/exception": "~1.0",
+ "hoa/file": "~1.0",
+ "hoa/visitor": "~2.0"
},
"require-dev": {
- "hoa/test": "~1.0"
+ "hoa/test": "~2.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.x-dev"
+ "dev-master": "2.x-dev"
}
},
"autoload": {
"library",
"ruler"
],
- "time": "2015-11-09 06:58:52"
+ "time": "2016-01-14 21:42:47"
},
{
"name": "hoa/stream",
- "version": "0.15.10.26",
+ "version": "1.16.01.14",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/Stream.git",
- "reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3"
+ "reference": "c00b35078ef8c0881b7d2ed533de19fe0aaf9896"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/hoaproject/Stream/zipball/011ab91d942f1d7096deade4c8a10fe57d51c5b3",
- "reference": "011ab91d942f1d7096deade4c8a10fe57d51c5b3",
+ "url": "https://api.github.com/repos/hoaproject/Stream/zipball/c00b35078ef8c0881b7d2ed533de19fe0aaf9896",
+ "reference": "c00b35078ef8c0881b7d2ed533de19fe0aaf9896",
"shasum": ""
},
"require": {
- "hoa/core": "~2.0"
+ "hoa/consistency": "~1.0",
+ "hoa/event": "~1.0",
+ "hoa/exception": "~1.0",
+ "hoa/protocol": "~1.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.x-dev"
+ "dev-master": "1.x-dev"
}
},
"autoload": {
"stream",
"wrapper"
],
- "time": "2015-10-22 06:30:43"
+ "time": "2016-01-14 20:11:37"
},
{
"name": "hoa/ustring",
- "version": "3.15.11.09",
+ "version": "4.16.01.11",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/Ustring.git",
- "reference": "8506be4910212b1a2beb9014763a8a4fbd871001"
+ "reference": "9f76b9aae5901b4f476ef854e29ccd746d6899d2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/hoaproject/Ustring/zipball/8506be4910212b1a2beb9014763a8a4fbd871001",
- "reference": "8506be4910212b1a2beb9014763a8a4fbd871001",
+ "url": "https://api.github.com/repos/hoaproject/Ustring/zipball/9f76b9aae5901b4f476ef854e29ccd746d6899d2",
+ "reference": "9f76b9aae5901b4f476ef854e29ccd746d6899d2",
"shasum": ""
},
"require": {
- "hoa/core": "~2.0"
+ "hoa/consistency": "~1.0",
+ "hoa/exception": "~1.0"
},
"require-dev": {
- "hoa/test": "~1.0"
+ "hoa/test": "~2.0"
},
"suggest": {
"ext-iconv": "ext/iconv must be present (or a third implementation) to use Hoa\\Ustring::transcode().",
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.x-dev"
+ "dev-master": "4.x-dev"
}
},
"autoload": {
"string",
"unicode"
],
- "time": "2015-11-09 06:44:33"
+ "time": "2016-01-11 09:51:34"
},
{
"name": "hoa/visitor",
- "version": "1.15.08.17",
+ "version": "2.16.01.11",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/Visitor.git",
- "reference": "e30bfff741f71979f6476a41548e34afe8053c67"
+ "reference": "cb21074b7eb89c3ac9f76d25c72671d579735ca9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/hoaproject/Visitor/zipball/e30bfff741f71979f6476a41548e34afe8053c67",
- "reference": "e30bfff741f71979f6476a41548e34afe8053c67",
+ "url": "https://api.github.com/repos/hoaproject/Visitor/zipball/cb21074b7eb89c3ac9f76d25c72671d579735ca9",
+ "reference": "cb21074b7eb89c3ac9f76d25c72671d579735ca9",
"shasum": ""
},
"require": {
- "hoa/core": "~2.0"
+ "hoa/consistency": "~1.0"
},
"require-dev": {
- "hoa/test": "~1.0"
+ "hoa/test": "~2.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.x-dev"
+ "dev-master": "2.x-dev"
}
},
"autoload": {
"visit",
"visitor"
],
- "time": "2015-08-17 06:30:58"
+ "time": "2016-01-11 09:54:01"
+ },
+ {
+ "name": "hoa/zformat",
+ "version": "1.16.01.14",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/hoaproject/Zformat.git",
+ "reference": "685bba314c5cacb97afdd5e638b64c42399a580c"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/hoaproject/Zformat/zipball/685bba314c5cacb97afdd5e638b64c42399a580c",
+ "reference": "685bba314c5cacb97afdd5e638b64c42399a580c",
+ "shasum": ""
+ },
+ "require": {
+ "hoa/consistency": "~1.0",
+ "hoa/exception": "~1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Hoa\\Zformat\\": "."
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Ivan Enderlin",
+ "email": "ivan.enderlin@hoa-project.net"
+ },
+ {
+ "name": "Hoa community",
+ "homepage": "http://hoa-project.net/"
+ }
+ ],
+ "description": "The Hoa\\Zformat library.",
+ "homepage": "http://hoa-project.net/",
+ "keywords": [
+ "library",
+ "parameter",
+ "zformat"
+ ],
+ "time": "2016-01-14 20:19:54"
},
{
"name": "htmlawed/htmlawed",
},
{
"name": "j0k3r/graby",
- "version": "1.0.8",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/j0k3r/graby.git",
- "reference": "bf152ccc6629bdd63b1e5e8b297c2912516b5f1e"
+ "reference": "fa5356fbbabe8288ed57a978ab05725c7063727e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/j0k3r/graby/zipball/bf152ccc6629bdd63b1e5e8b297c2912516b5f1e",
- "reference": "bf152ccc6629bdd63b1e5e8b297c2912516b5f1e",
+ "url": "https://api.github.com/repos/j0k3r/graby/zipball/fa5356fbbabe8288ed57a978ab05725c7063727e",
+ "reference": "fa5356fbbabe8288ed57a978ab05725c7063727e",
"shasum": ""
},
"require": {
"ext-curl": "*",
"guzzlehttp/guzzle": "^5.2.0",
"htmlawed/htmlawed": "^1.1.19",
- "j0k3r/graby-site-config": "^1.0.0",
+ "j0k3r/graby-site-config": "^1.0",
"j0k3r/php-readability": "^1.0",
"j0k3r/safecurl": "~2.0",
"monolog/monolog": "^1.13.1",
}
],
"description": "Graby helps you extract article content from web pages",
- "time": "2015-12-24 08:28:38"
+ "time": "2016-01-15 09:52:40"
},
{
"name": "j0k3r/graby-site-config",
- "version": "1.0.11",
+ "version": "1.0.12",
"source": {
"type": "git",
"url": "https://github.com/j0k3r/graby-site-config.git",
- "reference": "ac198f308beabccc97bbd35ed0daeaac63fbf1e3"
+ "reference": "ddd602cab137ee40ac3f5a8dd9b749bea7d2f541"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/ac198f308beabccc97bbd35ed0daeaac63fbf1e3",
- "reference": "ac198f308beabccc97bbd35ed0daeaac63fbf1e3",
+ "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/ddd602cab137ee40ac3f5a8dd9b749bea7d2f541",
+ "reference": "ddd602cab137ee40ac3f5a8dd9b749bea7d2f541",
"shasum": ""
},
"require": {
}
],
"description": "Graby site config files",
- "time": "2015-12-23 22:52:15"
+ "time": "2016-01-15 09:59:00"
},
{
"name": "j0k3r/php-readability",
},
{
"name": "jms/serializer",
- "version": "0.16.0",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/serializer.git",
- "reference": "c8a171357ca92b6706e395c757f334902d430ea9"
+ "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/c8a171357ca92b6706e395c757f334902d430ea9",
- "reference": "c8a171357ca92b6706e395c757f334902d430ea9",
+ "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/fe13a1f993ea3456e195b7820692f2eb2b6bbb48",
+ "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48",
"shasum": ""
},
"require": {
"doctrine/annotations": "1.*",
+ "doctrine/instantiator": "~1.0.3",
"jms/metadata": "~1.1",
"jms/parser-lib": "1.*",
- "php": ">=5.3.2",
+ "php": ">=5.4.0",
"phpcollection/phpcollection": "~0.1"
},
+ "conflict": {
+ "twig/twig": "<1.12"
+ },
"require-dev": {
"doctrine/orm": "~2.1",
"doctrine/phpcr-odm": "~1.0.1",
"jackalope/jackalope-doctrine-dbal": "1.0.*",
+ "phpunit/phpunit": "~4.0",
"propel/propel1": "~1.7",
"symfony/filesystem": "2.*",
"symfony/form": "~2.1",
"symfony/translation": "~2.0",
"symfony/validator": "~2.0",
"symfony/yaml": "2.*",
- "twig/twig": ">=1.8,<2.0-dev"
+ "twig/twig": "~1.12|~2.0"
},
"suggest": {
"symfony/yaml": "Required if you'd like to serialize data to YAML format."
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.15-dev"
+ "dev-master": "1.1-dev"
}
},
"autoload": {
],
"authors": [
{
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "https://github.com/schmittjoh",
- "role": "Developer of wrapped JMSSerializerBundle"
+ "name": "Johannes M. Schmitt",
+ "email": "schmittjoh@gmail.com"
}
],
"description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.",
"serialization",
"xml"
],
- "time": "2014-03-18 08:39:00"
+ "time": "2015-10-27 09:24:41"
},
{
"name": "jms/serializer-bundle",
- "version": "0.13.0",
+ "version": "1.1.0",
"target-dir": "JMS/SerializerBundle",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/JMSSerializerBundle.git",
- "reference": "bb15db3e661168f4310fad48b86915ff1ca33795"
+ "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/bb15db3e661168f4310fad48b86915ff1ca33795",
- "reference": "bb15db3e661168f4310fad48b86915ff1ca33795",
+ "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/3e396c980545350c2efb65a50041d2a9f9d6562e",
+ "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e",
"shasum": ""
},
"require": {
- "jms/serializer": "~0.11",
- "php": ">=5.3.2",
- "symfony/framework-bundle": "~2.1"
+ "jms/serializer": "^1.0.0",
+ "php": ">=5.4.0",
+ "phpoption/phpoption": "^1.1.0",
+ "symfony/framework-bundle": "~2.3|~3.0"
},
"require-dev": {
"doctrine/doctrine-bundle": "*",
"symfony/finder": "*",
"symfony/form": "*",
"symfony/process": "*",
+ "symfony/stopwatch": "*",
"symfony/twig-bundle": "*",
"symfony/validator": "*",
"symfony/yaml": "*"
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "0.13-dev"
+ "dev-master": "1.1-dev"
}
},
"autoload": {
],
"authors": [
{
- "name": "Johannes Schmitt",
- "email": "schmittjoh@gmail.com",
- "homepage": "https://github.com/schmittjoh",
- "role": "Developer of wrapped JMSSerializerBundle"
+ "name": "Johannes M. Schmitt",
+ "email": "schmittjoh@gmail.com"
}
],
"description": "Allows you to easily serialize, and deserialize data of any complexity",
"serialization",
"xml"
],
- "time": "2013-12-05 14:36:11"
+ "time": "2015-11-10 12:26:42"
},
{
"name": "kphoen/rulerz",
- "version": "0.16.2",
+ "version": "0.17.0",
"source": {
"type": "git",
"url": "https://github.com/K-Phoen/rulerz.git",
- "reference": "2b4fd796dadad204353e966b9f53040225ce6871"
+ "reference": "4ebd03bd801d17f108ab74f611b8ec1b430c909f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/K-Phoen/rulerz/zipball/2b4fd796dadad204353e966b9f53040225ce6871",
- "reference": "2b4fd796dadad204353e966b9f53040225ce6871",
+ "url": "https://api.github.com/repos/K-Phoen/rulerz/zipball/4ebd03bd801d17f108ab74f611b8ec1b430c909f",
+ "reference": "4ebd03bd801d17f108ab74f611b8ec1b430c909f",
"shasum": ""
},
"require": {
- "hoa/ruler": "~1.0",
+ "hoa/ruler": "~2.0",
"php": ">=5.5",
- "symfony/property-access": "~2.3"
+ "symfony/property-access": "~2.3|~3.0"
},
"require-dev": {
"behat/behat": "~3.0",
"doctrine",
"specification"
],
- "time": "2015-12-07 22:24:24"
+ "time": "2016-01-13 16:55:19"
},
{
"name": "kphoen/rulerz-bundle",
- "version": "0.11.0",
+ "version": "0.11.1",
"source": {
"type": "git",
"url": "https://github.com/K-Phoen/RulerZBundle.git",
- "reference": "dcaaed69d8252fa1e3a25802f8cf697947570778"
+ "reference": "57416b75d70d21c10c1f1c31b9fd6d2a7f82a277"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/K-Phoen/RulerZBundle/zipball/dcaaed69d8252fa1e3a25802f8cf697947570778",
- "reference": "dcaaed69d8252fa1e3a25802f8cf697947570778",
+ "url": "https://api.github.com/repos/K-Phoen/RulerZBundle/zipball/57416b75d70d21c10c1f1c31b9fd6d2a7f82a277",
+ "reference": "57416b75d70d21c10c1f1c31b9fd6d2a7f82a277",
"shasum": ""
},
"require": {
"kphoen/rulerz": "~0.1, >=0.13.0",
- "symfony/framework-bundle": "~2.3|~3.0",
- "symfony/validator": "~2.3|~3.0"
+ "symfony/framework-bundle": "~2.5|~3.0",
+ "symfony/validator": "~2.5|~3.0"
},
"require-dev": {
"matthiasnoback/symfony-dependency-injection-test": "~0.7",
"mikey179/vfsstream": "~1.0",
- "phpunit/phpunit": "~4.8"
+ "phpunit/phpunit": "~4.8",
+ "symfony/phpunit-bridge": "~2.7|~3.0"
},
"type": "symfony-bundle",
"autoload": {
"rulerz",
"specification"
],
- "time": "2015-11-13 13:00:14"
+ "time": "2016-01-11 13:54:58"
},
{
"name": "kriswallsmith/assetic",
},
{
"name": "lexik/form-filter-bundle",
- "version": "v4.0.2",
+ "version": "v5.0.0",
"source": {
"type": "git",
"url": "https://github.com/lexik/LexikFormFilterBundle.git",
- "reference": "d6081d308b71e14509602722c78d28801e4ed78a"
+ "reference": "dbc3c81600d2334a3408b37dccc3627d2019472c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/lexik/LexikFormFilterBundle/zipball/d6081d308b71e14509602722c78d28801e4ed78a",
- "reference": "d6081d308b71e14509602722c78d28801e4ed78a",
+ "url": "https://api.github.com/repos/lexik/LexikFormFilterBundle/zipball/dbc3c81600d2334a3408b37dccc3627d2019472c",
+ "reference": "dbc3c81600d2334a3408b37dccc3627d2019472c",
"shasum": ""
},
"require": {
- "doctrine/orm": "~2.2",
- "php": ">=5.3.2",
- "symfony/form": "~2.7",
- "symfony/framework-bundle": "~2.7"
+ "doctrine/orm": "^2.4.8",
+ "php": ">=5.5.9",
+ "symfony/form": "~2.8|~3.0",
+ "symfony/framework-bundle": "~2.8|~3.0"
},
"require-dev": {
+ "doctrine/mongodb-odm-bundle": "~3.0",
"phpunit/phpunit": "~3.7"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "4.x.x-dev"
+ "dev-master": "5.x.x-dev"
}
},
"autoload": {
"filter",
"form"
],
- "time": "2015-10-20 12:45:52"
+ "time": "2016-01-11 17:05:05"
},
{
"name": "liip/theme-bundle",
- "version": "1.1.3",
- "target-dir": "Liip/ThemeBundle",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/liip/LiipThemeBundle.git",
- "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b"
+ "reference": "ae4f0f1b045689bed9150d5bd32d2f7f2f98b905"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/a594cc6deda293034b8fd7795c9950f02fc8251b",
- "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b",
+ "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/ae4f0f1b045689bed9150d5bd32d2f7f2f98b905",
+ "reference": "ae4f0f1b045689bed9150d5bd32d2f7f2f98b905",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
- "symfony/framework-bundle": "~2.0"
+ "php": "^5.3.9|^7.0",
+ "psr/log": "~1.0",
+ "symfony/framework-bundle": "~2.3|~3.0"
},
"require-dev": {
- "symfony/console": "~2.0",
- "symfony/expression-language": "~2.6"
+ "kriswallsmith/assetic": "~1.1",
+ "phpunit/php-code-coverage": "~2.2@stable",
+ "phpunit/phpunit": "~4.5@stable",
+ "symfony/console": "~2.3|~3.0",
+ "symfony/expression-language": "~2.6|~3.0",
+ "twig/twig": "~1.4|~2.0@dev"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "1.1-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
- "psr-0": {
- "Liip\\ThemeBundle": ""
+ "psr-4": {
+ "Liip\\ThemeBundle\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"themes",
"theming"
],
- "time": "2015-02-02 15:55:54"
+ "time": "2015-12-05 09:33:29"
},
{
"name": "mgargano/simplehtmldom",
"time": "2014-10-06 10:57:25"
},
{
- "name": "phpcollection/phpcollection",
- "version": "0.4.0",
+ "name": "paragonie/random_compat",
+ "version": "1.1.5",
"source": {
"type": "git",
- "url": "https://github.com/schmittjoh/php-collection.git",
- "reference": "b8bf55a0a929ca43b01232b36719f176f86c7e83"
+ "url": "https://github.com/paragonie/random_compat.git",
+ "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/b8bf55a0a929ca43b01232b36719f176f86c7e83",
- "reference": "b8bf55a0a929ca43b01232b36719f176f86c7e83",
+ "url": "https://api.github.com/repos/paragonie/random_compat/zipball/dd8998b7c846f6909f4e7a5f67fabebfc412a4f7",
+ "reference": "dd8998b7c846f6909f4e7a5f67fabebfc412a4f7",
"shasum": ""
},
"require": {
- "phpoption/phpoption": "1.*"
+ "php": ">=5.2.0"
},
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "0.3-dev"
- }
+ "require-dev": {
+ "phpunit/phpunit": "4.*|5.*"
},
- "autoload": {
- "psr-0": {
- "PhpCollection": "src/"
- }
+ "suggest": {
+ "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
},
- "notification-url": "https://packagist.org/downloads/",
+ "type": "library",
+ "autoload": {
+ "files": [
+ "lib/random.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Paragon Initiative Enterprises",
+ "email": "security@paragonie.com",
+ "homepage": "https://paragonie.com"
+ }
+ ],
+ "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+ "keywords": [
+ "csprng",
+ "pseudorandom",
+ "random"
+ ],
+ "time": "2016-01-06 13:31:20"
+ },
+ {
+ "name": "phpcollection/phpcollection",
+ "version": "0.4.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/schmittjoh/php-collection.git",
+ "reference": "b8bf55a0a929ca43b01232b36719f176f86c7e83"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/b8bf55a0a929ca43b01232b36719f176f86c7e83",
+ "reference": "b8bf55a0a929ca43b01232b36719f176f86c7e83",
+ "shasum": ""
+ },
+ "require": {
+ "phpoption/phpoption": "1.*"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "0.3-dev"
+ }
+ },
+ "autoload": {
+ "psr-0": {
+ "PhpCollection": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
"license": [
"Apache2"
],
},
{
"name": "scheb/two-factor-bundle",
- "version": "v1.4.7",
+ "version": "v2.0.0",
"source": {
"type": "git",
"url": "https://github.com/scheb/two-factor-bundle.git",
- "reference": "ef6830dbbf62b22efd335db8f64bf0f51d4284a2"
+ "reference": "27c8e3530c077bbfb2a5312dd8fc3005f26c0fc4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/ef6830dbbf62b22efd335db8f64bf0f51d4284a2",
- "reference": "ef6830dbbf62b22efd335db8f64bf0f51d4284a2",
+ "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/27c8e3530c077bbfb2a5312dd8fc3005f26c0fc4",
+ "reference": "27c8e3530c077bbfb2a5312dd8fc3005f26c0fc4",
"shasum": ""
},
"require": {
+ "paragonie/random_compat": "~1.0",
"sonata-project/google-authenticator": "~1.0",
- "symfony/symfony": "~2.1"
+ "symfony/symfony": "~2.6|~3.0"
},
"require-dev": {
"satooshi/php-coveralls": "~0.6",
"swiftmailer/swiftmailer": ">=4.3, <6.0",
- "symfony/phpunit-bridge": "~2.7"
+ "symfony/phpunit-bridge": "~2.7|~3.0"
},
"type": "symfony-bundle",
"autoload": {
"email": "me@christianscheb.de"
}
],
- "description": "Provides two-factor authenticaton for Symfony2",
+ "description": "Provides two-factor authentication for Symfony applications",
"homepage": "https://github.com/scheb/two-factor-bundle",
"keywords": [
"Authentication",
- "Symfony2",
+ "security",
+ "symfony",
"two-factor",
"two-step"
],
- "time": "2015-08-25 19:58:00"
+ "time": "2015-12-31 17:20:20"
},
{
"name": "sensio/distribution-bundle",
- "version": "v3.0.34",
- "target-dir": "Sensio/Bundle/DistributionBundle",
+ "version": "v5.0.3",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
- "reference": "587f3cd08bf8856cfc888b255f34f18b85930657"
+ "reference": "419c1824af940e2be0f833aca2327e1181a6b503"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/587f3cd08bf8856cfc888b255f34f18b85930657",
- "reference": "587f3cd08bf8856cfc888b255f34f18b85930657",
+ "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/419c1824af940e2be0f833aca2327e1181a6b503",
+ "reference": "419c1824af940e2be0f833aca2327e1181a6b503",
"shasum": ""
},
"require": {
- "php": ">=5.3.3",
+ "php": ">=5.3.9",
"sensiolabs/security-checker": "~3.0",
- "symfony/class-loader": "~2.2",
- "symfony/framework-bundle": "~2.3",
- "symfony/process": "~2.2"
- },
- "require-dev": {
- "symfony/form": "~2.2",
- "symfony/validator": "~2.2",
- "symfony/yaml": "~2.2"
- },
- "suggest": {
- "symfony/form": "If you want to use the configurator",
- "symfony/validator": "If you want to use the configurator",
- "symfony/yaml": "If you want to use the configurator"
+ "symfony/class-loader": "~2.3|~3.0",
+ "symfony/config": "~2.3|~3.0",
+ "symfony/dependency-injection": "~2.3|~3.0",
+ "symfony/filesystem": "~2.3|~3.0",
+ "symfony/http-kernel": "~2.3|~3.0",
+ "symfony/process": "~2.3|~3.0"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "3.0.x-dev"
+ "dev-master": "5.0.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Sensio\\Bundle\\DistributionBundle": ""
+ "psr-4": {
+ "Sensio\\Bundle\\DistributionBundle\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
"configuration",
"distribution"
],
- "time": "2015-11-26 18:10:17"
+ "time": "2015-12-18 17:44:11"
},
{
"name": "sensio/framework-extra-bundle",
},
{
"name": "stof/doctrine-extensions-bundle",
- "version": "v1.2.1",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/stof/StofDoctrineExtensionsBundle.git",
- "reference": "7b3144572617b0555f9a443317dbc2f9cf5b524e"
+ "reference": "6672ca37fe19a8e2a8ae52a93a7163e1b00ef7d5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/7b3144572617b0555f9a443317dbc2f9cf5b524e",
- "reference": "7b3144572617b0555f9a443317dbc2f9cf5b524e",
+ "url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/6672ca37fe19a8e2a8ae52a93a7163e1b00ef7d5",
+ "reference": "6672ca37fe19a8e2a8ae52a93a7163e1b00ef7d5",
"shasum": ""
},
"require": {
"gedmo/doctrine-extensions": "^2.3.1",
"php": ">=5.3.2",
- "symfony/framework-bundle": "~2.1"
+ "symfony/framework-bundle": "~2.1|~3.0"
},
"suggest": {
"doctrine/doctrine-bundle": "to use the ORM extensions",
"translatable",
"tree"
],
- "time": "2015-08-12 16:23:48"
+ "time": "2015-11-26 18:29:38"
},
{
"name": "swiftmailer/swiftmailer",
],
"time": "2015-11-17 10:02:29"
},
+ {
+ "name": "symfony/polyfill-intl-icu",
+ "version": "v1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-intl-icu.git",
+ "reference": "2deb44160e1c886241c06602b12b98779f728177"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/2deb44160e1c886241c06602b12b98779f728177",
+ "reference": "2deb44160e1c886241c06602b12b98779f728177",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "symfony/intl": "~2.3|~3.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill for intl's ICU-related data and classes",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "icu",
+ "intl",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "time": "2015-11-04 20:28:58"
+ },
+ {
+ "name": "symfony/polyfill-mbstring",
+ "version": "v1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-mbstring.git",
+ "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25",
+ "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "suggest": {
+ "ext-mbstring": "For best performance"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Mbstring\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill for the Mbstring extension",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "mbstring",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "time": "2015-11-20 09:19:13"
+ },
+ {
+ "name": "symfony/polyfill-php56",
+ "version": "v1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php56.git",
+ "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/e2e77609a9e2328eb370fbb0e0d8b2000ebb488f",
+ "reference": "e2e77609a9e2328eb370fbb0e0d8b2000ebb488f",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3",
+ "symfony/polyfill-util": "~1.0"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Php56\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "time": "2015-12-18 15:10:25"
+ },
+ {
+ "name": "symfony/polyfill-php70",
+ "version": "v1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-php70.git",
+ "reference": "7f7f3c9c2b9f17722e0cd64fdb4f957330c53146"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/7f7f3c9c2b9f17722e0cd64fdb4f957330c53146",
+ "reference": "7f7f3c9c2b9f17722e0cd64fdb4f957330c53146",
+ "shasum": ""
+ },
+ "require": {
+ "paragonie/random_compat": "~1.0",
+ "php": ">=5.3.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Php70\\": ""
+ },
+ "files": [
+ "bootstrap.php"
+ ],
+ "classmap": [
+ "Resources/stubs"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compatibility",
+ "polyfill",
+ "portable",
+ "shim"
+ ],
+ "time": "2015-11-04 20:28:58"
+ },
+ {
+ "name": "symfony/polyfill-util",
+ "version": "v1.0.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/polyfill-util.git",
+ "reference": "4271c55cbc0a77b2641f861b978123e46b3da969"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4271c55cbc0a77b2641f861b978123e46b3da969",
+ "reference": "4271c55cbc0a77b2641f861b978123e46b3da969",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.3"
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Polyfill\\Util\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Grekas",
+ "email": "p@tchwork.com"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors"
+ }
+ ],
+ "description": "Symfony utilities for portability of PHP codes",
+ "homepage": "https://symfony.com",
+ "keywords": [
+ "compat",
+ "compatibility",
+ "polyfill",
+ "shim"
+ ],
+ "time": "2015-11-04 20:28:58"
+ },
{
"name": "symfony/swiftmailer-bundle",
- "version": "v2.3.9",
+ "version": "v2.3.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/swiftmailer-bundle.git",
- "reference": "3d21ada19f23631f558ad6df653b168e35362e78"
+ "reference": "de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/3d21ada19f23631f558ad6df653b168e35362e78",
- "reference": "3d21ada19f23631f558ad6df653b168e35362e78",
+ "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51",
+ "reference": "de5a2ddcaf91d2e44c19161e0fe8ed88022ceb51",
"shasum": ""
},
"require": {
],
"description": "Symfony SwiftmailerBundle",
"homepage": "http://symfony.com",
- "time": "2015-11-28 10:59:29"
+ "time": "2016-01-14 10:25:38"
},
{
"name": "symfony/symfony",
- "version": "v2.7.8",
+ "version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/symfony.git",
- "reference": "ad264021e44a5aaa132f16aef69f92e56795683e"
+ "reference": "979d7323716fec847508eac3e62d59b117612a6e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/symfony/zipball/ad264021e44a5aaa132f16aef69f92e56795683e",
- "reference": "ad264021e44a5aaa132f16aef69f92e56795683e",
+ "url": "https://api.github.com/repos/symfony/symfony/zipball/979d7323716fec847508eac3e62d59b117612a6e",
+ "reference": "979d7323716fec847508eac3e62d59b117612a6e",
"shasum": ""
},
"require": {
"doctrine/common": "~2.4",
- "php": ">=5.3.9",
+ "php": ">=5.5.9",
"psr/log": "~1.0",
+ "symfony/polyfill-intl-icu": "~1.0",
+ "symfony/polyfill-mbstring": "~1.0",
+ "symfony/polyfill-php56": "~1.0",
+ "symfony/polyfill-php70": "~1.0",
+ "symfony/polyfill-util": "~1.0",
"twig/twig": "~1.23|~2.0"
},
+ "conflict": {
+ "phpdocumentor/reflection": "<1.0.7"
+ },
"replace": {
"symfony/asset": "self.version",
"symfony/browser-kit": "self.version",
"symfony/http-foundation": "self.version",
"symfony/http-kernel": "self.version",
"symfony/intl": "self.version",
- "symfony/locale": "self.version",
+ "symfony/ldap": "self.version",
"symfony/monolog-bridge": "self.version",
"symfony/options-resolver": "self.version",
"symfony/process": "self.version",
"symfony/property-access": "self.version",
+ "symfony/property-info": "self.version",
"symfony/proxy-manager-bridge": "self.version",
"symfony/routing": "self.version",
"symfony/security": "self.version",
- "symfony/security-acl": "self.version",
"symfony/security-bundle": "self.version",
"symfony/security-core": "self.version",
"symfony/security-csrf": "self.version",
+ "symfony/security-guard": "self.version",
"symfony/security-http": "self.version",
"symfony/serializer": "self.version",
"symfony/stopwatch": "self.version",
- "symfony/swiftmailer-bridge": "self.version",
"symfony/templating": "self.version",
"symfony/translation": "self.version",
"symfony/twig-bridge": "self.version",
"require-dev": {
"doctrine/data-fixtures": "1.0.*",
"doctrine/dbal": "~2.4",
- "doctrine/doctrine-bundle": "~1.2",
+ "doctrine/doctrine-bundle": "~1.4",
"doctrine/orm": "~2.4,>=2.4.5",
"egulias/email-validator": "~1.2",
- "ircmaxell/password-compat": "~1.0",
"monolog/monolog": "~1.11",
- "ocramius/proxy-manager": "~0.4|~1.0"
+ "ocramius/proxy-manager": "~0.4|~1.0",
+ "phpdocumentor/reflection": "^1.0.7",
+ "symfony/security-acl": "~2.8|~3.0"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
"Symfony\\Component\\": "src/Symfony/Component/"
},
"classmap": [
- "src/Symfony/Component/HttpFoundation/Resources/stubs",
"src/Symfony/Component/Intl/Resources/stubs"
],
- "files": [
- "src/Symfony/Component/Intl/Resources/stubs/functions.php"
- ],
"exclude-from-classmap": [
"**/Tests/"
]
"keywords": [
"framework"
],
- "time": "2015-12-26 15:02:06"
+ "time": "2015-12-26 16:49:48"
},
{
"name": "tecnickcom/tcpdf",
},
{
"name": "twig/twig",
- "version": "v1.23.1",
+ "version": "v1.23.3",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6"
+ "reference": "ae53fc2c312fdee63773b75cb570304f85388b08"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
- "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/ae53fc2c312fdee63773b75cb570304f85388b08",
+ "reference": "ae53fc2c312fdee63773b75cb570304f85388b08",
"shasum": ""
},
"require": {
"keywords": [
"templating"
],
- "time": "2015-11-05 12:49:06"
+ "time": "2016-01-11 14:02:19"
},
{
"name": "wallabag/php-mobi",
},
{
"name": "willdurand/hateoas",
- "version": "v2.6.0",
+ "version": "v2.9.0",
"source": {
"type": "git",
"url": "https://github.com/willdurand/Hateoas.git",
- "reference": "fc0869381d6934e5d430084154584761297caa6c"
+ "reference": "6e6ee945100bef3534c9276f0cf1c70d0115670c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/willdurand/Hateoas/zipball/fc0869381d6934e5d430084154584761297caa6c",
- "reference": "fc0869381d6934e5d430084154584761297caa6c",
+ "url": "https://api.github.com/repos/willdurand/Hateoas/zipball/6e6ee945100bef3534c9276f0cf1c70d0115670c",
+ "reference": "6e6ee945100bef3534c9276f0cf1c70d0115670c",
"shasum": ""
},
"require": {
"doctrine/annotations": "~1.0",
"doctrine/common": "~2.0",
"jms/metadata": "~1.1",
- "jms/serializer": "~0.13",
- "php": ">=5.3",
- "symfony/expression-language": "~2.4"
+ "jms/serializer": "~1.0",
+ "php": ">=5.4",
+ "symfony/expression-language": "~2.4 || ~3.0"
},
"require-dev": {
"atoum/atoum": "*@dev",
"hautelook/frankenstein": "~0.1",
"pagerfanta/pagerfanta": "~1.0",
"phpunit/phpunit": "~3.7",
- "symfony/dependency-injection": "~2.0",
- "symfony/routing": "~2.0",
- "symfony/yaml": "~2.0",
+ "symfony/dependency-injection": "~2.0 || ~3.0",
+ "symfony/routing": "~2.0 || ~3.0",
+ "symfony/yaml": "~2.0 || ~3.0",
"twig/twig": "~1.12"
},
"suggest": {
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.9-dev"
}
},
"autoload": {
}
],
"description": "A PHP library to support implementing representations for HATEOAS REST web services",
- "time": "2015-05-21 21:57:34"
+ "time": "2015-12-04 15:31:02"
},
{
"name": "willdurand/hateoas-bundle",
- "version": "0.5.0",
+ "version": "1.1.0",
"target-dir": "Bazinga/Bundle/HateoasBundle",
"source": {
"type": "git",
"url": "https://github.com/willdurand/BazingaHateoasBundle.git",
- "reference": "3c86e8080e8a229365a0ce91818da6fe6562376b"
+ "reference": "205a5a16899716f33edfb7a5afc4d451d0d2d0b2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/3c86e8080e8a229365a0ce91818da6fe6562376b",
- "reference": "3c86e8080e8a229365a0ce91818da6fe6562376b",
+ "url": "https://api.github.com/repos/willdurand/BazingaHateoasBundle/zipball/205a5a16899716f33edfb7a5afc4d451d0d2d0b2",
+ "reference": "205a5a16899716f33edfb7a5afc4d451d0d2d0b2",
"shasum": ""
},
"require": {
- "jms/serializer-bundle": "~0.13",
- "symfony/framework-bundle": "~2.2",
- "willdurand/hateoas": "~2.0"
+ "jms/serializer-bundle": "~1.0",
+ "symfony/framework-bundle": "~2.2 || ~3.0",
+ "willdurand/hateoas": "~2.9"
},
"require-dev": {
- "symfony/expression-language": "~2.4",
+ "symfony/expression-language": "~2.4 || ~3.0",
"twig/twig": "~1.12"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "1.2-dev"
}
},
"autoload": {
"HATEOAS",
"rest"
],
- "time": "2015-02-19 16:27:51"
+ "time": "2015-12-07 08:25:05"
},
{
"name": "willdurand/jsonp-callback-validator",
},
{
"name": "doctrine/doctrine-fixtures-bundle",
- "version": "v2.2.1",
+ "version": "2.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineFixturesBundle.git",
- "reference": "817c2d233fde0fe85cb7e4d25d43fbfcd028aef8"
+ "reference": "0f1a2f91b349e10f5c343f75ab71d23aace5b029"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/817c2d233fde0fe85cb7e4d25d43fbfcd028aef8",
- "reference": "817c2d233fde0fe85cb7e4d25d43fbfcd028aef8",
+ "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/0f1a2f91b349e10f5c343f75ab71d23aace5b029",
+ "reference": "0f1a2f91b349e10f5c343f75ab71d23aace5b029",
"shasum": ""
},
"require": {
"doctrine/data-fixtures": "~1.0",
"doctrine/doctrine-bundle": "~1.0",
"php": ">=5.3.2",
- "symfony/doctrine-bridge": "~2.1"
+ "symfony/doctrine-bridge": "~2.3|~3.0"
},
"type": "symfony-bundle",
"extra": {
"Fixture",
"persistence"
],
- "time": "2015-08-04 22:43:14"
+ "time": "2015-11-04 21:23:23"
},
{
"name": "phpdocumentor/reflection-docblock",
},
{
"name": "sensio/generator-bundle",
- "version": "v2.5.3",
- "target-dir": "Sensio/Bundle/GeneratorBundle",
+ "version": "v3.0.5",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
- "reference": "e50108c2133ee5c9c484555faed50c17a61221d3"
+ "reference": "5274eafa251359087230bade2ff35dd6cec2e530"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/e50108c2133ee5c9c484555faed50c17a61221d3",
- "reference": "e50108c2133ee5c9c484555faed50c17a61221d3",
+ "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/5274eafa251359087230bade2ff35dd6cec2e530",
+ "reference": "5274eafa251359087230bade2ff35dd6cec2e530",
"shasum": ""
},
"require": {
- "symfony/console": "~2.5",
- "symfony/framework-bundle": "~2.2"
+ "symfony/console": "~2.7|~3.0",
+ "symfony/framework-bundle": "~2.7|~3.0",
+ "symfony/process": "~2.7|~3.0",
+ "symfony/yaml": "~2.7|~3.0"
},
"require-dev": {
- "doctrine/orm": "~2.2,>=2.2.3",
- "symfony/doctrine-bridge": "~2.2",
- "twig/twig": "~1.11"
+ "doctrine/orm": "~2.4",
+ "symfony/doctrine-bridge": "~2.7|~3.0",
+ "twig/twig": "~1.18"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "2.5.x-dev"
+ "dev-master": "3.0.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Sensio\\Bundle\\GeneratorBundle": ""
- }
+ "psr-4": {
+ "Sensio\\Bundle\\GeneratorBundle\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
}
],
"description": "This bundle generates code for you",
- "time": "2015-03-17 06:36:52"
+ "time": "2016-01-05 16:30:36"
},
{
"name": "symfony/phpunit-bridge",
- "version": "v2.7.8",
+ "version": "v2.8.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
- "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed"
+ "reference": "855dc0e829fad123966347612b4183e307338c11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e960e64acbed50e49818eb78840486c8d7fe1bed",
- "reference": "e960e64acbed50e49818eb78840486c8d7fe1bed",
+ "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/855dc0e829fad123966347612b4183e307338c11",
+ "reference": "855dc0e829fad123966347612b4183e307338c11",
"shasum": ""
},
"require": {
- "php": ">=5.3.9"
+ "php": ">=5.3.3"
},
"suggest": {
"symfony/debug": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
"type": "symfony-bridge",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev"
+ "dev-master": "2.8-dev"
}
},
"autoload": {
],
"description": "Symfony PHPUnit Bridge",
"homepage": "https://symfony.com",
- "time": "2015-11-06 10:15:01"
+ "time": "2016-01-06 09:59:23"
}
],
"aliases": [],
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
- "php": ">=5.5.0"
+ "php": ">=5.5.9"
},
"platform-dev": []
}
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
- bootstrap="app/bootstrap.php.cache"
+ bootstrap="app/autoload.php"
>
<testsuites>
<testsuite name="wallabag Test Suite">
- <directory>./src/Wallabag/*Bundle/Tests</directory>
+ <directory>src/Wallabag/*Bundle/Tests</directory>
</testsuite>
</testsuites>
<php>
- <server name="KERNEL_DIR" value="./app/" />
- <!--
- Avoid tests to fail because of deprecated stuff
- see: http://symfony.com/doc/current/cookbook/upgrade/major_version.html#deprecations-in-phpunit
- -->
- <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
+ <server name="KERNEL_DIR" value="app/" />
</php>
<filter>
<whitelist>
- <directory>./src</directory>
+ <directory>src</directory>
<exclude>
- <directory>./vendor</directory>
- <directory>./src/Wallabag/*Bundle/Resources</directory>
- <directory>./src/Wallabag/*Bundle/Tests</directory>
- <directory>./src/Wallabag/*Bundle/DataFixtures</directory>
+ <directory>vendor</directory>
+ <directory>src/Wallabag/*Bundle/Resources</directory>
+ <directory>src/Wallabag/*Bundle/Tests</directory>
+ <directory>src/Wallabag/*Bundle/DataFixtures</directory>
</exclude>
</whitelist>
</filter>
namespace Wallabag\ApiBundle\Controller;
use FOS\RestBundle\Controller\FOSRestController;
+use Hateoas\Configuration\Route;
+use Hateoas\Representation\Factory\PagerfantaFactory;
use Nelmio\ApiDocBundle\Annotation\ApiDoc;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
-use Hateoas\Configuration\Route;
-use Hateoas\Representation\Factory\PagerfantaFactory;
class WallabagRestController extends FOSRestController
{
$pagerfantaFactory = new PagerfantaFactory('page', 'perPage');
$paginatedCollection = $pagerfantaFactory->createRepresentation(
$pager,
- new Route('api_get_entries', [], $absolute = true)
+ new Route('api_get_entries', [], UrlGeneratorInterface::ABSOLUTE_URL)
);
$json = $this->get('serializer')->serialize($paginatedCollection, 'json');
namespace Wallabag\ApiBundle\Entity;
-use FOS\OAuthServerBundle\Entity\AccessToken as BaseAccessToken;
use Doctrine\ORM\Mapping as ORM;
+use FOS\OAuthServerBundle\Entity\AccessToken as BaseAccessToken;
/**
* @ORM\Table("oauth2_access_tokens")
namespace Wallabag\ApiBundle\Entity;
-use FOS\OAuthServerBundle\Entity\AuthCode as BaseAuthCode;
use Doctrine\ORM\Mapping as ORM;
+use FOS\OAuthServerBundle\Entity\AuthCode as BaseAuthCode;
/**
* @ORM\Table("oauth2_auth_codes")
namespace Wallabag\ApiBundle\Entity;
-use FOS\OAuthServerBundle\Entity\Client as BaseClient;
use Doctrine\ORM\Mapping as ORM;
+use FOS\OAuthServerBundle\Entity\Client as BaseClient;
/**
* @ORM\Table("oauth2_clients")
namespace Wallabag\ApiBundle\Entity;
-use FOS\OAuthServerBundle\Entity\RefreshToken as BaseRefreshToken;
use Doctrine\ORM\Mapping as ORM;
+use FOS\OAuthServerBundle\Entity\RefreshToken as BaseRefreshToken;
/**
* @ORM\Table("oauth2_refresh_tokens")
namespace Wallabag\CoreBundle\Command;
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\ArrayInput;
-use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Output\NullOutput;
-use Symfony\Component\Console\Question\Question;
+use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ConfirmationQuestion;
-use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Question\Question;
use Wallabag\CoreBundle\Entity\Config;
class InstallCommand extends ContainerAwareCommand
;
$output->writeln('<info>Wallabag has been successfully installed.</info>');
- $output->writeln('<comment>Just execute `php app/console server:run` for using wallabag: http://localhost:8000</comment>');
+ $output->writeln('<comment>Just execute `php bin/console server:run` for using wallabag: http://localhost:8000</comment>');
}
protected function checkRequirements()
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\CoreBundle\Entity\TaggingRule;
-use Wallabag\UserBundle\Entity\User;
+use Wallabag\CoreBundle\Form\Type\ConfigType;
use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
-use Wallabag\CoreBundle\Form\Type\UserInformationType;
-use Wallabag\CoreBundle\Form\Type\TaggingRuleType;
use Wallabag\CoreBundle\Form\Type\NewUserType;
use Wallabag\CoreBundle\Form\Type\RssType;
+use Wallabag\CoreBundle\Form\Type\TaggingRuleType;
+use Wallabag\CoreBundle\Form\Type\UserInformationType;
use Wallabag\CoreBundle\Tools\Utils;
+use Wallabag\UserBundle\Entity\User;
class ConfigController extends Controller
{
$user = $this->getUser();
// handle basic config detail (this form is defined as a service)
- $configForm = $this->createForm('config', $config, array('action' => $this->generateUrl('config')));
+ $configForm = $this->createForm(ConfigType::class, $config, array('action' => $this->generateUrl('config')));
$configForm->handleRequest($request);
if ($configForm->isValid()) {
}
// handle changing password
- $pwdForm = $this->createForm(new ChangePasswordType(), null, array('action' => $this->generateUrl('config').'#set4'));
+ $pwdForm = $this->createForm(ChangePasswordType::class, null, array('action' => $this->generateUrl('config').'#set4'));
$pwdForm->handleRequest($request);
if ($pwdForm->isValid()) {
}
// handle changing user information
- $userForm = $this->createForm(new UserInformationType(), $user, array(
+ $userForm = $this->createForm(UserInformationType::class, $user, array(
'validation_groups' => array('Profile'),
'action' => $this->generateUrl('config').'#set3',
));
}
// handle rss information
- $rssForm = $this->createForm(new RssType(), $config, array('action' => $this->generateUrl('config').'#set2'));
+ $rssForm = $this->createForm(RssType::class, $config, array('action' => $this->generateUrl('config').'#set2'));
$rssForm->handleRequest($request);
if ($rssForm->isValid()) {
// handle tagging rule
$taggingRule = new TaggingRule();
- $newTaggingRule = $this->createForm(new TaggingRuleType(), $taggingRule, array('action' => $this->generateUrl('config').'#set5'));
+ $newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, array('action' => $this->generateUrl('config').'#set5'));
$newTaggingRule->handleRequest($request);
if ($newTaggingRule->isValid()) {
$newUser = $userManager->createUser();
// enable created user by default
$newUser->setEnabled(true);
- $newUserForm = $this->createForm(new NewUserType(), $newUser, array(
+ $newUserForm = $this->createForm(NewUserType::class, $newUser, array(
'validation_groups' => array('Profile'),
'action' => $this->generateUrl('config').'#set5',
));
namespace Wallabag\CoreBundle\Controller;
+use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Pagerfanta;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Form\Type\NewEntryType;
-use Wallabag\CoreBundle\Form\Type\EditEntryType;
use Wallabag\CoreBundle\Filter\EntryFilterType;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
-use Pagerfanta\Pagerfanta;
+use Wallabag\CoreBundle\Form\Type\EditEntryType;
+use Wallabag\CoreBundle\Form\Type\NewEntryType;
class EntryController extends Controller
{
{
$entry = new Entry($this->getUser());
- $form = $this->createForm(new NewEntryType(), $entry);
+ $form = $this->createForm(NewEntryType::class, $entry);
$form->handleRequest($request);
{
$this->checkUserAction($entry);
- $form = $this->createForm(new EditEntryType(), $entry);
+ $form = $this->createForm(EditEntryType::class, $entry);
$form->handleRequest($request);
throw new \InvalidArgumentException(sprintf('Type "%s" is not implemented.', $type));
}
- $form = $this->get('form.factory')->create(new EntryFilterType($repository, $this->getUser()));
+ $form = $this->createForm(EntryFilterType::class);
if ($request->query->has($form->getName())) {
// manually bind values from the request
namespace Wallabag\CoreBundle\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Pagerfanta\Adapter\DoctrineORMAdapter;
+use Pagerfanta\Pagerfanta;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Entity\Entry;
-use Pagerfanta\Adapter\DoctrineORMAdapter;
-use Pagerfanta\Pagerfanta;
+use Wallabag\UserBundle\Entity\User;
class RssController extends Controller
{
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
-use Wallabag\CoreBundle\Form\Type\NewTagType;
-use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\CoreBundle\Entity\Tag;
+use Wallabag\CoreBundle\Form\Type\NewTagType;
class TagController extends Controller
{
public function addTagFormAction(Request $request, Entry $entry)
{
$tag = new Tag();
- $form = $this->createForm(new NewTagType(), $tag);
+ $form = $this->createForm(NewTagType::class, $tag);
$form->handleRequest($request);
if ($form->isValid()) {
namespace Wallabag\CoreBundle\DependencyInjection;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
class WallabagCoreExtension extends Extension
{
use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Constraints as Assert;
use Hateoas\Configuration\Annotation as Hateoas;
use JMS\Serializer\Annotation\Groups;
use JMS\Serializer\Annotation\XmlRoot;
+use Symfony\Component\Validator\Constraints as Assert;
use Wallabag\UserBundle\Entity\User;
/**
namespace Wallabag\CoreBundle\Entity;
+use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\ORM\Mapping as ORM;
-use JMS\Serializer\Annotation\XmlRoot;
use JMS\Serializer\Annotation\ExclusionPolicy;
use JMS\Serializer\Annotation\Expose;
-use Doctrine\Common\Collections\ArrayCollection;
use Gedmo\Mapping\Annotation as Gedmo;
+use JMS\Serializer\Annotation\XmlRoot;
/**
* Tag.
namespace Wallabag\CoreBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
-use Symfony\Component\Validator\Constraints as Assert;
use KPhoen\RulerZBundle\Validator\Constraints as RulerZAssert;
+use Symfony\Component\Validator\Constraints as Assert;
/**
* Tagging rule.
namespace Wallabag\CoreBundle\Event\Subscriber;
-use Lexik\Bundle\FormFilterBundle\Event\Subscriber\DoctrineORMSubscriber;
use Lexik\Bundle\FormFilterBundle\Event\GetFilterConditionEvent;
+use Lexik\Bundle\FormFilterBundle\Event\Subscriber\DoctrineORMSubscriber;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
/**
namespace Wallabag\CoreBundle\EventListener;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
/**
* @see http://symfony.com/doc/current/cookbook/session/locale_sticky_session.html
namespace Wallabag\CoreBundle\EventListener;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Doctrine\ORM\EntityManager;
use FOS\UserBundle\Event\FilterUserResponseEvent;
use FOS\UserBundle\FOSUserEvents;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Wallabag\CoreBundle\Entity\Config;
class RegistrationConfirmedListener implements EventSubscriberInterface
namespace Wallabag\CoreBundle\Filter;
+use Doctrine\ORM\EntityRepository;
+use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
+use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberRangeFilterType;
+use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\DateRangeFilterType;
+use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\TextFilterType;
+use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\CheckboxFilterType;
+use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
-use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
-use Doctrine\ORM\EntityRepository;
-use Wallabag\UserBundle\Entity\User;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
class EntryFilterType extends AbstractType
{
* Repository & user are used to get a list of language entries for this user.
*
* @param EntityRepository $entryRepository
- * @param User $user
+ * @param TokenStorage $token
*/
- public function __construct(EntityRepository $entryRepository, User $user)
+ public function __construct(EntityRepository $entryRepository, TokenStorage $token)
{
$this->repository = $entryRepository;
- $this->user = $user;
+ $this->user = $token->getToken()->getUser();
}
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
- ->add('readingTime', 'filter_number_range')
- ->add('createdAt', 'filter_date_range', array(
+ ->add('readingTime', NumberRangeFilterType::class)
+ ->add('createdAt', DateRangeFilterType::class, array(
'left_date_options' => array(
'attr' => array(
'placeholder' => 'dd/mm/yyyy',
),
)
)
- ->add('domainName', 'filter_text', array(
+ ->add('domainName', TextFilterType::class, array(
'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
- $value = $values['value'];
- if (strlen($value) <= 2 || empty($value)) {
- return;
- }
- $expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->literal('%'.$value.'%'));
+ $value = $values['value'];
+ if (strlen($value) <= 2 || empty($value)) {
+ return;
+ }
+ $expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->literal('%'.$value.'%'));
- return $filterQuery->createCondition($expression);
+ return $filterQuery->createCondition($expression);
},
))
- ->add('isArchived', 'filter_checkbox')
- ->add('isStarred', 'filter_checkbox')
- ->add('previewPicture', 'filter_checkbox', array(
+ ->add('isArchived', CheckboxFilterType::class)
+ ->add('isStarred', CheckboxFilterType::class)
+ ->add('previewPicture', CheckboxFilterType::class, array(
'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
if (false === $values['value']) {
return;
return $filterQuery->createCondition($expression);
},
))
- ->add('language', 'filter_choice', array(
- 'choices' => $this->repository->findDistinctLanguageByUser($this->user->getId()),
+ ->add('language', ChoiceFilterType::class, array(
+ 'choices' => array_flip($this->repository->findDistinctLanguageByUser($this->user->getId())),
+ 'choices_as_values' => true,
))
;
}
- public function getName()
+ public function getBlockPrefix()
{
return 'entry_filter';
}
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
+use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
use Symfony\Component\Validator\Constraints;
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
- ->add('old_password', 'password', array(
+ ->add('old_password', PasswordType::class, array(
'constraints' => new UserPassword(array('message' => 'Wrong value for your current password')),
))
- ->add('new_password', 'repeated', array(
- 'type' => 'password',
+ ->add('new_password', RepeatedType::class, array(
+ 'type' => PasswordType::class,
'invalid_message' => 'The password fields must match.',
'required' => true,
'first_options' => array('label' => 'New password'),
new Constraints\NotBlank(),
),
))
- ->add('save', 'submit')
+ ->add('save', SubmitType::class)
;
}
- public function getName()
+ public function getBlockPrefix()
{
return 'change_passwd';
}
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
- ->add('theme', 'choice', array(
+ ->add('theme', ChoiceType::class, array(
'choices' => array_flip($this->themes),
'choices_as_values' => true,
))
->add('items_per_page')
- ->add('language', 'choice', array(
- 'choices' => $this->languages,
+ ->add('language', ChoiceType::class, array(
+ 'choices' => array_flip($this->languages),
+ 'choices_as_values' => true,
))
- ->add('save', 'submit')
+ ->add('save', SubmitType::class)
;
}
));
}
- public function getName()
+ public function getBlockPrefix()
{
return 'config';
}
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
- ->add('title', 'text', array('required' => true))
- ->add('is_public', 'checkbox', array('required' => false))
+ ->add('title', TextType::class, array('required' => true))
+ ->add('is_public', CheckboxType::class, array('required' => false))
// @todo: add autocomplete
// ->add('tags', 'entity', array(
// 'class' => 'Wallabag\CoreBundle\Entity\Tag',
// 'choice_translation_domain' => true,
// ))
- ->add('save', 'submit')
+ ->add('save', SubmitType::class)
;
}
));
}
- public function getName()
+ public function getBlockPrefix()
{
return 'entry';
}
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\UrlType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
- ->add('url', 'url', array('required' => true))
- ->add('save', 'submit')
+ ->add('url', UrlType::class, array('required' => true))
+ ->add('save', SubmitType::class)
;
}
));
}
- public function getName()
+ public function getBlockPrefix()
{
return 'entry';
}
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
- ->add('label', 'text', array('required' => true))
- ->add('save', 'submit')
+ ->add('label', TextType::class, array('required' => true))
+ ->add('save', SubmitType::class)
;
}
));
}
- public function getName()
+ public function getBlockPrefix()
{
return 'tag';
}
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\PasswordType;
+use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Validator\Constraints;
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
- ->add('username', 'text', array('required' => true))
- ->add('plainPassword', 'repeated', array(
- 'type' => 'password',
+ ->add('username', TextType::class, array('required' => true))
+ ->add('plainPassword', RepeatedType::class, array(
+ 'type' => PasswordType::class,
'constraints' => array(
new Constraints\Length(array(
'min' => 8,
new Constraints\NotBlank(),
),
))
- ->add('email', 'email')
- ->add('save', 'submit')
+ ->add('email', EmailType::class)
+ ->add('save', SubmitType::class)
;
}
));
}
- public function getName()
+ public function getBlockPrefix()
{
return 'new_user';
}
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
{
$builder
->add('rss_limit')
- ->add('save', 'submit')
+ ->add('save', SubmitType::class)
;
}
));
}
- public function getName()
+ public function getBlockPrefix()
{
return 'rss_config';
}
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Wallabag\CoreBundle\Form\DataTransformer\StringToListTransformer;
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
- ->add('rule', 'text', array('required' => true))
- ->add('save', 'submit')
+ ->add('rule', TextType::class, array('required' => true))
+ ->add('save', SubmitType::class)
;
$tagsField = $builder
- ->create('tags', 'text')
+ ->create('tags', TextType::class)
->addModelTransformer(new StringToListTransformer(','));
$builder->add($tagsField);
));
}
- public function getName()
+ public function getBlockPrefix()
{
return 'tagging_rule';
}
namespace Wallabag\CoreBundle\Form\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\EmailType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
- ->add('name', 'text')
- ->add('email', 'email')
- ->add('twoFactorAuthentication', 'checkbox', array('required' => false))
- ->add('save', 'submit')
+ ->add('name', TextType::class)
+ ->add('email', EmailType::class)
+ ->add('twoFactorAuthentication', CheckboxType::class, array('required' => false))
+ ->add('save', SubmitType::class)
->remove('username')
->remove('plainPassword')
;
public function getParent()
{
- return 'fos_user_registration';
+ return 'FOS\UserBundle\Form\Type\RegistrationFormType';
}
public function configureOptions(OptionsResolver $resolver)
));
}
- public function getName()
+ public function getBlockPrefix()
{
return 'update_user';
}
namespace Wallabag\CoreBundle\Helper;
+use JMS\Serializer;
+use JMS\Serializer\SerializationContext;
+use JMS\Serializer\SerializerBuilder;
use PHPePub\Core\EPub;
use PHPePub\Core\Structure\OPF\DublinCore;
use Symfony\Component\HttpFoundation\Response;
-use JMS\Serializer;
-use JMS\Serializer\SerializerBuilder;
-use JMS\Serializer\SerializationContext;
/**
* This class doesn't have unit test BUT it's fully covered by a functional test with ExportControllerTest.
namespace Wallabag\CoreBundle\ParamConverter;
-use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface;
use Doctrine\Common\Persistence\ManagerRegistry;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Wallabag\UserBundle\Entity\User;
wallabag_core.helper.detect_active_theme:
class: Wallabag\CoreBundle\Helper\DetectActiveTheme
arguments:
- - @security.token_storage
+ - "@security.token_storage"
- %theme% # default theme from parameters.yml
# custom form type
- %liip_theme.themes%
- %wallabag_core.languages%
tags:
- - { name: form.type, alias: config }
+ - { name: form.type }
- wallabag_core.form.registration:
- class: Wallabag\CoreBundle\Form\Type\RegistrationType
- tags:
- - { name: form.type, alias: wallabag_user_registration }
-
- wallabag_core.form.type.forgot_password:
- class: Wallabag\CoreBundle\Form\Type\ForgotPasswordType
+ wallabag_core.filter.type.entry:
+ class: Wallabag\CoreBundle\Filter\EntryFilterType
arguments:
- - @doctrine
+ - "@wallabag_core.entry_repository"
+ - "@security.token_storage"
tags:
- - { name: form.type, alias: forgot_password }
+ - { name: form.type }
wallabag_core.param_converter.username_rsstoken_converter:
class: Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter
tags:
- { name: request.param_converter, converter: username_rsstoken_converter }
arguments:
- - @doctrine
+ - "@doctrine"
wallabag_core.table_prefix_subscriber:
class: Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber
arguments:
- { error_message: false }
calls:
- - [ setLogger, [ @logger ] ]
+ - [ setLogger, [ "@logger" ] ]
tags:
- { name: monolog.logger, channel: graby }
wallabag_core.content_proxy:
class: Wallabag\CoreBundle\Helper\ContentProxy
arguments:
- - @wallabag_core.graby
- - @wallabag_core.rule_based_tagger
- - @logger
+ - "@wallabag_core.graby"
+ - "@wallabag_core.rule_based_tagger"
+ - "@logger"
wallabag_core.rule_based_tagger:
class: Wallabag\CoreBundle\Helper\RuleBasedTagger
arguments:
- - @rulerz
- - @wallabag_core.tag_repository
- - @wallabag_core.entry_repository
+ - "@rulerz"
+ - "@wallabag_core.tag_repository"
+ - "@wallabag_core.entry_repository"
# repository as a service
wallabag_core.entry_repository:
class: Wallabag\CoreBundle\Repository\EntryRepository
- factory: [ @doctrine.orm.default_entity_manager, getRepository ]
+ factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
arguments:
- WallabagCoreBundle:Entry
wallabag_core.tag_repository:
class: Wallabag\CoreBundle\Repository\TagRepository
- factory: [ @doctrine.orm.default_entity_manager, getRepository ]
+ factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
arguments:
- WallabagCoreBundle:Tag
wallabag_core.registration_confirmed:
class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener
arguments:
- - @doctrine.orm.entity_manager
+ - "@doctrine.orm.entity_manager"
- %theme%
- %items_on_page%
- %rss_limit%
{% endfor %}
</ul>
- <form action="{{ path('config') }}" method="post" {{ form_enctype(form.new_tagging_rule) }}>
+ {{ form_start(form.new_tagging_rule) }}
{{ form_errors(form.new_tagging_rule) }}
<fieldset class="w500p inline">
namespace Wallabag\CoreBundle\Subscriber;
-use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
use Doctrine\Common\EventSubscriber;
+use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
use Doctrine\ORM\Mapping\ClassMetadataInfo;
/**
namespace Wallabag\CoreBundle\Tests\Command;
-use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
-use Wallabag\CoreBundle\Command\InstallCommand;
-use Wallabag\CoreBundle\Tests\Mock\InstallCommandMock;
+use Doctrine\Bundle\DoctrineBundle\Command\CreateDatabaseDoctrineCommand;
+use Doctrine\Bundle\DoctrineBundle\Command\DropDatabaseDoctrineCommand;
use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Tester\CommandTester;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Output\NullOutput;
-use Doctrine\Bundle\DoctrineBundle\Command\DropDatabaseDoctrineCommand;
-use Doctrine\Bundle\DoctrineBundle\Command\CreateDatabaseDoctrineCommand;
+use Symfony\Component\Console\Tester\CommandTester;
+use Wallabag\CoreBundle\Command\InstallCommand;
+use Wallabag\CoreBundle\Tests\Mock\InstallCommandMock;
+use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
class InstallCommandTest extends WallabagCoreTestCase
{
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
-use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpKernel\KernelEvents;
use Wallabag\CoreBundle\EventListener\LocaleListener;
class LocaleListenerTest extends \PHPUnit_Framework_TestCase
namespace Wallabag\CoreBundle\Tests\EventListener;
+use FOS\UserBundle\Event\FilterUserResponseEvent;
+use FOS\UserBundle\FOSUserEvents;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
-use FOS\UserBundle\FOSUserEvents;
-use FOS\UserBundle\Event\FilterUserResponseEvent;
-use Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener;
use Wallabag\CoreBundle\Entity\Config;
+use Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener;
use Wallabag\UserBundle\Entity\User;
class RegistrationConfirmedListenerTest extends \PHPUnit_Framework_TestCase
namespace Wallabag\CoreBundle\Tests\EventListener;
use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
use Symfony\Component\HttpFoundation\Session\Session;
-use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
+use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Wallabag\CoreBundle\EventListener\UserLocaleListener;
+use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
use Wallabag\CoreBundle\Entity\Config;
+use Wallabag\CoreBundle\EventListener\UserLocaleListener;
use Wallabag\UserBundle\Entity\User;
class UserLocaleListenerTest extends \PHPUnit_Framework_TestCase
use Psr\Log\NullLogger;
use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Helper\ContentProxy;
+use Wallabag\UserBundle\Entity\User;
class ContentProxyTest extends \PHPUnit_Framework_TestCase
{
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Entity\TaggingRule;
-use Wallabag\UserBundle\Entity\User;
use Wallabag\CoreBundle\Helper\RuleBasedTagger;
+use Wallabag\UserBundle\Entity\User;
class RuleBasedTaggerTest extends \PHPUnit_Framework_TestCase
{
namespace Wallabag\CoreBundle\Tests\Command;
-use Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Symfony\Component\HttpFoundation\Request;
+use Wallabag\CoreBundle\ParamConverter\UsernameRssTokenConverter;
use Wallabag\UserBundle\Entity\User;
class UsernameRssTokenConverterTest extends \PHPUnit_Framework_TestCase
namespace Wallabag\CoreBundle\Tests\Subscriber;
-use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
use Doctrine\Common\EventManager;
+use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
+use Doctrine\ORM\Mapping\ClassMetadata;
use Wallabag\CoreBundle\Subscriber\TablePrefixSubscriber;
class TablePrefixSubscriberTest extends \PHPUnit_Framework_TestCase
namespace Wallabag\ImportBundle\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
class PocketController extends Controller
public function authAction()
{
$requestToken = $this->get('wallabag_import.pocket.import')
- ->getRequestToken($this->generateUrl('import', [], true));
+ ->getRequestToken($this->generateUrl('import', array(), UrlGeneratorInterface::ABSOLUTE_URL));
$this->get('session')->set('import.pocket.code', $requestToken);
return $this->redirect(
- 'https://getpocket.com/auth/authorize?request_token='.$requestToken.'&redirect_uri='.$this->generateUrl('import_pocket_callback', [], true),
+ 'https://getpocket.com/auth/authorize?request_token='.$requestToken.'&redirect_uri='.$this->generateUrl('import_pocket_callback', array(), UrlGeneratorInterface::ABSOLUTE_URL),
301
);
}
*/
public function indexAction(Request $request)
{
- $form = $this->createForm(new UploadImportType());
+ $form = $this->createForm(UploadImportType::class);
$form->handleRequest($request);
$wallabag = $this->get('wallabag_import.wallabag_v1.import');
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
class UploadImportType extends AbstractType
{
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
- ->add('file', 'file')
- ->add('save', 'submit')
+ ->add('file', FileType::class)
+ ->add('save', SubmitType::class)
;
}
- public function getName()
+ public function getBlockPrefix()
{
return 'upload_import_file';
}
namespace Wallabag\UserBundle\Controller;
-use FOS\UserBundle\FOSUserEvents;
+use FOS\UserBundle\Event\FilterUserResponseEvent;
use FOS\UserBundle\Event\FormEvent;
use FOS\UserBundle\Event\GetResponseUserEvent;
-use FOS\UserBundle\Event\FilterUserResponseEvent;
-use Symfony\Component\HttpFoundation\Request;
+use FOS\UserBundle\FOSUserEvents;
use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
class ResettingController extends \FOS\UserBundle\Controller\ResettingController
use Doctrine\ORM\Mapping as ORM;
use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface;
use Scheb\TwoFactorBundle\Model\TrustedComputerInterface;
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Security\Core\User\UserInterface;
+use FOS\UserBundle\Model\User as BaseUser;
use JMS\Serializer\Annotation\ExclusionPolicy;
use JMS\Serializer\Annotation\Expose;
-use FOS\UserBundle\Model\User as BaseUser;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Component\Security\Core\User\UserInterface;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\CoreBundle\Entity\Entry;
{% block messages %}{% endblock %}
{% block content %}
- <form action="{{ path('fos_user_registration_register') }}" {{ form_enctype(form) }} method="POST" class="fos_user_registration_register">
+ {{ form_start(form) }}
<fieldset class="w500p center">
<h2 class="mbs txtcenter">{% trans %}create an account{% endtrans %}</h2>
{% include "FOSUserBundle:Registration:register_content.html.twig" %}
{% trans_default_domain 'FOSUserBundle' %}
-<form action="{{ path('fos_user_change_password') }}" {{ form_enctype(form) }} method="POST" class="fos_user_change_password">
+{{ form_start(form, { 'action': path('fos_user_change_password'), 'attr': { 'class': 'fos_user_change_password' } }) }}
<div class="card-content">
<div class="row">
{{ form_widget(form) }}
{% trans_default_domain 'FOSUserBundle' %}
-<form action="{{ path('fos_user_registration_register') }}" {{ form_enctype(form) }} method="POST" class="fos_user_registration_register">
+{{ form_start(form, {'method': 'post', 'action': path('fos_user_registration_register'), 'attr': {'class': 'fos_user_registration_register'}}) }}
<div class="card-content">
<div class="row">
{% block fos_user_content %}
<div class="card-content">
<div class="row">
- {{ 'resetting.password_already_requested'|trans }}
+ {{ 'resetting.password_already_requested'|trans }}
</div>
</div>
{% endblock fos_user_content %}
{% trans_default_domain 'FOSUserBundle' %}
-<form action="{{ path('fos_user_resetting_reset', {'token': token}) }}" {{ form_enctype(form) }} method="POST" class="fos_user_resetting_reset">
+{{ form_start(form, { 'action': path('fos_user_resetting_reset', {'token': token}), 'attr': { 'class': 'fos_user_resetting_reset' } }) }}
<div class="card-content">
<div class="row">
{{ form_widget(form) }}
# to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
DirectoryIndex app.php
+# By default, Apache does not evaluate symbolic links if you did not enable this
+# feature in your server configuration. Uncomment the following line if you
+# install assets as symlinks or if you experience problems related to symlinks
+# when compiling LESS/Sass/CoffeScript assets.
+# Options FollowSymlinks
+
+# Disabling MultiViews prevents unwanted negotiation, e.g. "/app" should not resolve
+# to the front controller "/app.php" but be rewritten to "/app.php/app".
+<IfModule mod_negotiation.c>
+ Options -MultiViews
+</IfModule>
+
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$
RewriteRule ^(.*) - [E=BASE:%1]
- # Sets the HTTP_AUTHORIZATION header removed by apache
+ # Sets the HTTP_AUTHORIZATION header removed by Apache
RewriteCond %{HTTP:Authorization} .
- RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+ RewriteRule ^ - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
# Redirect to URI without front controller to prevent duplicate content
# (with and without `/app.php`). Only do this redirect on the initial
# - use Apache >= 2.3.9 and replace all L flags by END flags and remove the
# following RewriteCond (best solution)
RewriteCond %{ENV:REDIRECT_STATUS} ^$
- RewriteRule ^app\.php(/(.*)|$) %{ENV:BASE}/$2 [R=301,L]
+ RewriteRule ^app\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
# If the requested filename exists, simply serve it.
# We only want to let Apache serve files and not directories.
RewriteCond %{REQUEST_FILENAME} -f
- RewriteRule .? - [L]
+ RewriteRule ^ - [L]
# Rewrite all other queries to the front controller.
- RewriteRule .? %{ENV:BASE}/app.php [L]
+ RewriteRule ^ %{ENV:BASE}/app.php [L]
</IfModule>
<IfModule !mod_rewrite.c>
<?php
-use Symfony\Component\ClassLoader\ApcClassLoader;
use Symfony\Component\HttpFoundation\Request;
-$loader = require_once __DIR__.'/../app/bootstrap.php.cache';
+/**
+ * @var Composer\Autoload\ClassLoader
+ */
+$loader = require __DIR__.'/../app/autoload.php';
+include_once __DIR__.'/../var/bootstrap.php.cache';
// Enable APC for autoloading to improve performance.
// You should change the ApcClassLoader first argument to a unique prefix
// in order to prevent cache key conflicts with other applications
// also using APC.
/*
-$apcLoader = new ApcClassLoader(sha1(__FILE__), $loader);
+$apcLoader = new Symfony\Component\ClassLoader\ApcClassLoader(sha1(__FILE__), $loader);
$loader->unregister();
$apcLoader->register(true);
*/
-require_once __DIR__.'/../app/AppKernel.php';
-//require_once __DIR__.'/../app/AppCache.php';
-
$kernel = new AppKernel('prod', false);
$kernel->loadClassCache();
//$kernel = new AppCache($kernel);
use Symfony\Component\Debug\Debug;
// If you don't want to setup permissions the proper way, just uncomment the following PHP line
-// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
+// read http://symfony.com/doc/current/book/installation.html#checking-symfony-application-configuration-and-setup
+// for more information
//umask(0000);
// This check prevents access to debug front controllers that are deployed by accident to production servers.
// Feel free to remove this, extend it, or make something more sophisticated.
if (isset($_SERVER['HTTP_CLIENT_IP'])
|| isset($_SERVER['HTTP_X_FORWARDED_FOR'])
- || !(in_array(@$_SERVER['REMOTE_ADDR'], array('127.0.0.1', 'fe80::1', '::1')) || php_sapi_name() === 'cli-server')
+ || !(in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', 'fe80::1', '::1']) || php_sapi_name() === 'cli-server')
) {
header('HTTP/1.0 403 Forbidden');
exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
}
-$loader = require_once __DIR__.'/../app/bootstrap.php.cache';
+/**
+ * @var Composer\Autoload\ClassLoader $loader
+ */
+$loader = require __DIR__.'/../app/autoload.php';
Debug::enable();
-require_once __DIR__.'/../app/AppKernel.php';
-
$kernel = new AppKernel('dev', true);
$kernel->loadClassCache();
$request = Request::createFromGlobals();
+# www.robotstxt.org/
+# www.google.com/support/webmasters/bin/answer.py?hl=en&answer=156449
+
User-agent: *
-Disallow: /
\ No newline at end of file
projects / github / wallabag / wallabag.git / commitdiff
