diff --git a/app/AppKernel.php b/app/AppKernel.php index 5d30753..172d10c 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -28,6 +28,7 @@ class AppKernel extends Kernel if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); + $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(); diff --git a/app/Resources/translations/messages.en.yml b/app/Resources/translations/messages.en.yml index 6d1e518..b65454b 100644 --- a/app/Resources/translations/messages.en.yml +++ b/app/Resources/translations/messages.en.yml @@ -36,6 +36,7 @@ set: partCount: Count of parts theme: Theme theme.all: All Themes + theme.placeholder: All Themes download: unicolor.button: Download set (Uni-color) @@ -72,6 +73,7 @@ model: search: Search category: Category category.all: All Categories + category.placeholder: All Categories subparts: Subparts related: Related bricks parents: Parent bricks @@ -140,4 +142,5 @@ part: form: search.submit: Search + meta.description: "Web catalogue of LEGO® parts for 3D printing" \ No newline at end of file diff --git a/app/Resources/views/embeds/modal.html.twig b/app/Resources/views/embeds/modal.html.twig deleted file mode 100644 index 619d892..0000000 --- a/app/Resources/views/embeds/modal.html.twig +++ /dev/null @@ -1,19 +0,0 @@ - \ No newline at end of file diff --git a/composer.lock b/composer.lock index 19a8734..c8a18c9 100644 --- a/composer.lock +++ b/composer.lock @@ -1509,27 +1509,27 @@ }, { "name": "knplabs/knp-paginator-bundle", - "version": "2.5.4", + "version": "v2.6.0", "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpPaginatorBundle.git", - "reference": "1618a19a871ba1245dc68e462b35e7df07dcfcc3" + "reference": "293abb6a2f1ae53ace5796d0ef3e5ae1b8f92371" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/KnpLabs/KnpPaginatorBundle/zipball/1618a19a871ba1245dc68e462b35e7df07dcfcc3", - "reference": "1618a19a871ba1245dc68e462b35e7df07dcfcc3", + "url": "https://api.github.com/repos/KnpLabs/KnpPaginatorBundle/zipball/293abb6a2f1ae53ace5796d0ef3e5ae1b8f92371", + "reference": "293abb6a2f1ae53ace5796d0ef3e5ae1b8f92371", "shasum": "" }, "require": { "knplabs/knp-components": "~1.2", "php": ">=5.3.3", - "symfony/framework-bundle": "~2.3|~3.0", + "symfony/framework-bundle": "~2.7|~3.0", "twig/twig": "~1.12|~2" }, "require-dev": { "phpunit/phpunit": "~4.8", - "symfony/expression-language": "~2.4|~3.0" + "symfony/expression-language": "~2.7|~3.0" }, "type": "symfony-bundle", "extra": { @@ -1567,7 +1567,7 @@ "pagination", "paginator" ], - "time": "2017-03-21T09:45:46+00:00" + "time": "2017-06-09T15:25:39+00:00" }, { "name": "league/flysystem", @@ -1755,16 +1755,16 @@ }, { "name": "monolog/monolog", - "version": "1.22.1", + "version": "1.23.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0" + "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1e044bc4b34e91743943479f1be7a1d5eb93add0", - "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4", + "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4", "shasum": "" }, "require": { @@ -1785,7 +1785,7 @@ "phpunit/phpunit-mock-objects": "2.3.0", "ruflin/elastica": ">=0.90 <3.0", "sentry/sentry": "^0.13", - "swiftmailer/swiftmailer": "~5.3" + "swiftmailer/swiftmailer": "^5.3|^6.0" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", @@ -1829,20 +1829,20 @@ "logging", "psr-3" ], - "time": "2017-03-13T07:08:03+00:00" + "time": "2017-06-19T01:22:40+00:00" }, { "name": "oneup/flysystem-bundle", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/1up-lab/OneupFlysystemBundle.git", - "reference": "0984d82d682b24d5017b0d8fc54090651baa71b0" + "reference": "1224bd9f50b5c655fea312a10f624d029768d3ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/1up-lab/OneupFlysystemBundle/zipball/0984d82d682b24d5017b0d8fc54090651baa71b0", - "reference": "0984d82d682b24d5017b0d8fc54090651baa71b0", + "url": "https://api.github.com/repos/1up-lab/OneupFlysystemBundle/zipball/1224bd9f50b5c655fea312a10f624d029768d3ff", + "reference": "1224bd9f50b5c655fea312a10f624d029768d3ff", "shasum": "" }, "require": { @@ -1858,6 +1858,7 @@ "league/flysystem-gridfs": "^1.0", "league/flysystem-memory": "^1.0", "league/flysystem-rackspace": "^1.0", + "league/flysystem-replicate-adapter": "^1.0", "league/flysystem-sftp": "^1.0", "league/flysystem-webdav": "^1.0", "league/flysystem-ziparchive": "^1.0", @@ -1881,6 +1882,7 @@ "league/flysystem-dropbox": "Use Dropbox storage", "league/flysystem-gridfs": "Allows you to use GridFS adapter", "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files", + "league/flysystem-replicate-adapter": "Allows you to use the Replica adapter from Flysystem", "league/flysystem-sftp": "Allows SFTP server storage via phpseclib", "league/flysystem-webdav": "Allows you to use WebDAV storage", "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter", @@ -1914,7 +1916,7 @@ "abstraction", "filesystem" ], - "time": "2017-04-24T08:44:27+00:00" + "time": "2017-06-13T08:16:42+00:00" }, { "name": "paragonie/random_compat", @@ -2593,16 +2595,16 @@ }, { "name": "symfony/polyfill-apcu", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "5d4474f447403c3348e37b70acc2b95475b7befa" + "reference": "2e7965b8cdfbba50d0092d3f6dca97dddec409e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/5d4474f447403c3348e37b70acc2b95475b7befa", - "reference": "5d4474f447403c3348e37b70acc2b95475b7befa", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/2e7965b8cdfbba50d0092d3f6dca97dddec409e2", + "reference": "2e7965b8cdfbba50d0092d3f6dca97dddec409e2", "shasum": "" }, "require": { @@ -2611,7 +2613,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2642,25 +2644,25 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2017-06-09T08:25:21+00:00" }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "2d6e2b20d457603eefb6e614286c22efca30fdb4" + "reference": "3191cbe0ce64987bd382daf6724af31c53daae01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/2d6e2b20d457603eefb6e614286c22efca30fdb4", - "reference": "2d6e2b20d457603eefb6e614286c22efca30fdb4", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/3191cbe0ce64987bd382daf6724af31c53daae01", + "reference": "3191cbe0ce64987bd382daf6724af31c53daae01", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/intl": "~2.3|~3.0" + "symfony/intl": "~2.3|~3.0|~4.0" }, "suggest": { "ext-intl": "For best performance" @@ -2668,7 +2670,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2700,20 +2702,20 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2017-06-09T08:25:21+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" + "reference": "f29dca382a6485c3cbe6379f0c61230167681937" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f29dca382a6485c3cbe6379f0c61230167681937", + "reference": "f29dca382a6485c3cbe6379f0c61230167681937", "shasum": "" }, "require": { @@ -2725,7 +2727,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2759,20 +2761,20 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2017-06-09T14:24:12+00:00" }, { "name": "symfony/polyfill-php56", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c" + "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/1dd42b9b89556f18092f3d1ada22cb05ac85383c", - "reference": "1dd42b9b89556f18092f3d1ada22cb05ac85383c", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/bc0b7d6cb36b10cfabb170a3e359944a95174929", + "reference": "bc0b7d6cb36b10cfabb170a3e359944a95174929", "shasum": "" }, "require": { @@ -2782,7 +2784,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2815,20 +2817,20 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2017-06-09T08:25:21+00:00" }, { "name": "symfony/polyfill-php70", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "13ce343935f0f91ca89605a2f6ca6f5c2f3faac2" + "reference": "032fd647d5c11a9ceab8ee8747e13b5448e93874" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/13ce343935f0f91ca89605a2f6ca6f5c2f3faac2", - "reference": "13ce343935f0f91ca89605a2f6ca6f5c2f3faac2", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/032fd647d5c11a9ceab8ee8747e13b5448e93874", + "reference": "032fd647d5c11a9ceab8ee8747e13b5448e93874", "shasum": "" }, "require": { @@ -2838,7 +2840,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2874,20 +2876,20 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2017-06-09T14:24:12+00:00" }, { "name": "symfony/polyfill-util", - "version": "v1.3.0", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "746bce0fca664ac0a575e465f65c6643faddf7fb" + "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/746bce0fca664ac0a575e465f65c6643faddf7fb", - "reference": "746bce0fca664ac0a575e465f65c6643faddf7fb", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", + "reference": "ebccbde4aad410f6438d86d7d261c6b4d2b9a51d", "shasum": "" }, "require": { @@ -2896,7 +2898,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2926,7 +2928,7 @@ "polyfill", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2017-06-09T08:25:21+00:00" }, { "name": "symfony/swiftmailer-bundle", @@ -3142,16 +3144,16 @@ }, { "name": "twig/twig", - "version": "v2.4.2", + "version": "v2.4.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "fe3e3f3359b23b36f65cb600cd516142c07a2e7d" + "reference": "eab7c3288ae6603d7d6f92b531626af2b162d1f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/fe3e3f3359b23b36f65cb600cd516142c07a2e7d", - "reference": "fe3e3f3359b23b36f65cb600cd516142c07a2e7d", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/eab7c3288ae6603d7d6f92b531626af2b162d1f2", + "reference": "eab7c3288ae6603d7d6f92b531626af2b162d1f2", "shasum": "" }, "require": { @@ -3204,7 +3206,7 @@ "keywords": [ "templating" ], - "time": "2017-06-06T03:58:14+00:00" + "time": "2017-06-07T18:47:58+00:00" } ], "packages-dev": [ @@ -3444,16 +3446,16 @@ }, { "name": "liip/functional-test-bundle", - "version": "1.7.3", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/liip/LiipFunctionalTestBundle.git", - "reference": "fac05bc216c88e8cc855e0cd5fb3e2e81e54593a" + "reference": "e18866bc434fccdf0d04a4e776289ed999862b66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/fac05bc216c88e8cc855e0cd5fb3e2e81e54593a", - "reference": "fac05bc216c88e8cc855e0cd5fb3e2e81e54593a", + "url": "https://api.github.com/repos/liip/LiipFunctionalTestBundle/zipball/e18866bc434fccdf0d04a4e776289ed999862b66", + "reference": "e18866bc434fccdf0d04a4e776289ed999862b66", "shasum": "" }, "require": { @@ -3472,13 +3474,13 @@ "hautelook/alice-bundle": "~0.2|~1.2", "jackalope/jackalope-doctrine-dbal": "1.1.*|1.2.*", "nelmio/alice": "~1.7|~2.0", - "phpunit/phpunit": "4.8.*|~5.2", + "phpunit/phpunit": "^4.8.35|^5.7|^6.1", "symfony/assetic-bundle": "~2.3", "symfony/console": "~2.5|~3.0", "symfony/monolog-bundle": "~2.4", "symfony/phpunit-bridge": "^2.7|~3.0", "symfony/symfony": "~2.3.27|~2.7|~3.0", - "twig/twig": "~1.12" + "twig/twig": "~1.12|~2.0" }, "suggest": { "brianium/paratest": "Required when using paratest to parallelize tests", @@ -3518,7 +3520,7 @@ "keywords": [ "Symfony2" ], - "time": "2017-04-21T17:22:21+00:00" + "time": "2017-06-19T09:12:22+00:00" }, { "name": "myclabs/deep-copy", @@ -4125,16 +4127,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.2.1", + "version": "6.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "16999a1e9a8a25d68f0ab8cc8ab818b043ad5374" + "reference": "f2786490399836d2a544a34785c4a8d3ab32cf0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/16999a1e9a8a25d68f0ab8cc8ab818b043ad5374", - "reference": "16999a1e9a8a25d68f0ab8cc8ab818b043ad5374", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f2786490399836d2a544a34785c4a8d3ab32cf0e", + "reference": "f2786490399836d2a544a34785c4a8d3ab32cf0e", "shasum": "" }, "require": { @@ -4205,7 +4207,7 @@ "testing", "xunit" ], - "time": "2017-06-02T12:24:37+00:00" + "time": "2017-06-13T14:07:07+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -4429,16 +4431,16 @@ }, { "name": "sebastian/environment", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "02b6b2c7aefe2cdb1185b8dbf8718b0bcedf3ab3" + "reference": "74776f8dbc081cab9287c2a601c0c1d842568744" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/02b6b2c7aefe2cdb1185b8dbf8718b0bcedf3ab3", - "reference": "02b6b2c7aefe2cdb1185b8dbf8718b0bcedf3ab3", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/74776f8dbc081cab9287c2a601c0c1d842568744", + "reference": "74776f8dbc081cab9287c2a601c0c1d842568744", "shasum": "" }, "require": { @@ -4475,7 +4477,7 @@ "environment", "hhvm" ], - "time": "2017-05-18T10:10:00+00:00" + "time": "2017-06-20T16:25:05+00:00" }, { "name": "sebastian/exporter", @@ -4942,34 +4944,31 @@ "time": "2017-06-01T14:45:22+00:00" }, { - "name": "symfony/polyfill-xml", - "version": "v1.3.0", + "name": "symfony/polyfill-php72", + "version": "v1.4.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-xml.git", - "reference": "64b6a864f18ab4fddad49f5025f805f6781dfabd" + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "d3a71580c1e2cab33b6d705f0ec40e9015e14d5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-xml/zipball/64b6a864f18ab4fddad49f5025f805f6781dfabd", - "reference": "64b6a864f18ab4fddad49f5025f805f6781dfabd", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/d3a71580c1e2cab33b6d705f0ec40e9015e14d5c", + "reference": "d3a71580c1e2cab33b6d705f0ec40e9015e14d5c", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "suggest": { - "ext-xml": "For best performance" - }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { "psr-4": { - "Symfony\\Polyfill\\Xml\\": "" + "Symfony\\Polyfill\\Php72\\": "" }, "files": [ "bootstrap.php" @@ -4989,6 +4988,54 @@ "homepage": "https://symfony.com/contributors" } ], + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2017-06-09T08:25:21+00:00" + }, + { + "name": "symfony/polyfill-xml", + "version": "v1.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-xml.git", + "reference": "89326af9d173053826ae8fe26a6f49597ba4e9f3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-xml/zipball/89326af9d173053826ae8fe26a6f49597ba4e9f3", + "reference": "89326af9d173053826ae8fe26a6f49597ba4e9f3", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/polyfill-php72": "~1.4" + }, + "type": "metapackage", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "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 xml's utf8_encode and utf8_decode functions", "homepage": "https://symfony.com", "keywords": [ @@ -4997,7 +5044,7 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2017-06-09T08:25:21+00:00" }, { "name": "theseer/tokenizer", diff --git a/tests/AppBundle/Service/ZipServiceTest.php b/tests/AppBundle/Service/ZipServiceTest.php index bf52773..68e651e 100644 --- a/tests/AppBundle/Service/ZipServiceTest.php +++ b/tests/AppBundle/Service/ZipServiceTest.php @@ -27,8 +27,8 @@ class ZipServiceTest extends BaseTest LoadBaseData::class ]); - $this->modelService = $this->get(ModelService::class); - $this->setService = $this->get(SetService::class); + $this->modelService = new ModelService($this->em); + $this->setService = new SetService($this->em); $this->filesystem->write('models/1.stl',file_get_contents(__DIR__ . '/../Fixtures/models/1.stl'));