diff --git a/composer.json b/composer.json index edb07f3..ce28242 100644 --- a/composer.json +++ b/composer.json @@ -19,6 +19,7 @@ "symfony/framework-bundle": "^4.4", "symfony/monolog-bundle": "^3.3", "symfony/orm-pack": "^1.0", + "symfony/profiler-pack": "^1.0", "symfony/twig-bundle": "^4.4", "symfony/yaml": "^4.4", "tightenco/collect": "^5.6" diff --git a/composer.lock b/composer.lock index 839b1a2..d389ed5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d3da598f9488af7dcf4bbf3e7945f187", + "content-hash": "ea09297f32ae7bb1a4392cb514b0d0b2", "packages": [ { "name": "doctrine/annotations", @@ -4819,6 +4819,34 @@ ], "time": "2019-11-27T16:25:15+00:00" }, + { + "name": "symfony/profiler-pack", + "version": "v1.0.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/profiler-pack.git", + "reference": "99c4370632c2a59bb0444852f92140074ef02209" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/profiler-pack/zipball/99c4370632c2a59bb0444852f92140074ef02209", + "reference": "99c4370632c2a59bb0444852f92140074ef02209", + "shasum": "" + }, + "require": { + "php": "^7.0", + "symfony/stopwatch": "*", + "symfony/twig-bundle": "*", + "symfony/web-profiler-bundle": "*" + }, + "type": "symfony-pack", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A pack for the Symfony web profiler", + "time": "2018-12-10T12:11:44+00:00" + }, { "name": "symfony/property-info", "version": "v4.4.2", @@ -5526,6 +5554,70 @@ ], "time": "2019-12-01T08:48:26+00:00" }, + { + "name": "symfony/web-profiler-bundle", + "version": "v5.0.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/web-profiler-bundle.git", + "reference": "6cc40446060e174a690e0f6da90731133b29b664" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/6cc40446060e174a690e0f6da90731133b29b664", + "reference": "6cc40446060e174a690e0f6da90731133b29b664", + "shasum": "" + }, + "require": { + "php": "^7.2.5", + "symfony/config": "^4.4|^5.0", + "symfony/framework-bundle": "^4.4|^5.0", + "symfony/http-kernel": "^4.4|^5.0", + "symfony/routing": "^4.4|^5.0", + "symfony/twig-bundle": "^4.4|^5.0", + "twig/twig": "^2.10|^3.0" + }, + "conflict": { + "symfony/form": "<4.4", + "symfony/messenger": "<4.4" + }, + "require-dev": { + "symfony/console": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/stopwatch": "^4.4|^5.0" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Bundle\\WebProfilerBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony WebProfilerBundle", + "homepage": "https://symfony.com", + "time": "2019-11-21T07:02:40+00:00" + }, { "name": "symfony/yaml", "version": "v4.4.2", diff --git a/config/bundles.php b/config/bundles.php index 1afd455..47980cd 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -11,4 +11,5 @@ return [ Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], Nelmio\ApiDocBundle\NelmioApiDocBundle::class => ['all' => true], JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true], + Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true], ]; diff --git a/config/packages/dev/web_profiler.yaml b/config/packages/dev/web_profiler.yaml new file mode 100644 index 0000000..e92166a --- /dev/null +++ b/config/packages/dev/web_profiler.yaml @@ -0,0 +1,6 @@ +web_profiler: + toolbar: true + intercept_redirects: false + +framework: + profiler: { only_exceptions: false } diff --git a/config/packages/test/web_profiler.yaml b/config/packages/test/web_profiler.yaml new file mode 100644 index 0000000..03752de --- /dev/null +++ b/config/packages/test/web_profiler.yaml @@ -0,0 +1,6 @@ +web_profiler: + toolbar: false + intercept_redirects: false + +framework: + profiler: { collect: false } diff --git a/config/routes/dev/web_profiler.yaml b/config/routes/dev/web_profiler.yaml new file mode 100644 index 0000000..c82beff --- /dev/null +++ b/config/routes/dev/web_profiler.yaml @@ -0,0 +1,7 @@ +web_profiler_wdt: + resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml' + prefix: /_wdt + +web_profiler_profiler: + resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml' + prefix: /_profiler diff --git a/package.json b/package.json index 871b219..cfba593 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "sass-loader": "^7.1.0", "style-loader": "^0.22.1", "ts-loader": "^4.5.0", - "typescript": "^3.0.1", + "typescript": "^3.6", "vue": "^2.5.17", "vue-class-component": "^6.2.0", "vue-property-decorator": "^7.0.0", diff --git a/resources/ts/app.ts b/resources/ts/app.ts index 26ec082..399db4c 100644 --- a/resources/ts/app.ts +++ b/resources/ts/app.ts @@ -23,7 +23,7 @@ Vue.use(Vuex); import('./font-awesome'), import('./filters'), import('bootstrap'), - ]); + ] as const); // here goes "public" API window['czydojade'] = Object.assign({ diff --git a/resources/ts/components/map.ts b/resources/ts/components/map.ts index b971c0d..7a8635b 100644 --- a/resources/ts/components/map.ts +++ b/resources/ts/components/map.ts @@ -8,7 +8,7 @@ import * as iconRetinaUrl from 'leaflet/dist/images/marker-icon-2x.png'; import * as iconUrl from 'leaflet/dist/images/marker-icon.png'; import * as shadowUrl from 'leaflet/dist/images/marker-shadow.png'; -delete L.Icon.Default.prototype._getIconUrl; +delete L.Icon.Default.prototype['_getIconUrl']; L.Icon.Default.mergeOptions({ iconRetinaUrl, iconUrl, shadowUrl }); diff --git a/resources/ts/components/utils.ts b/resources/ts/components/utils.ts index a074847..a3f216e 100644 --- a/resources/ts/components/utils.ts +++ b/resources/ts/components/utils.ts @@ -102,7 +102,7 @@ export class FoldComponent extends Vue { @Watch('visible') private resize() { const inner = this.$refs['inner'] as HTMLDivElement; - this.$el.style.height = `${(this.visible && inner) ? inner.clientHeight : 0}px`; + (this.$el as HTMLElement).style.height = `${(this.visible && inner) ? inner.clientHeight : 0}px`; } } diff --git a/src/Model/Stop.php b/src/Model/Stop.php index 8db4eed..6deb0f1 100644 --- a/src/Model/Stop.php +++ b/src/Model/Stop.php @@ -4,17 +4,13 @@ namespace App\Model; use JMS\Serializer\Annotation as Serializer; use Swagger\Annotations as SWG; -use Symfony\Component\Serializer\Annotation\Groups; -use Symfony\Component\Serializer\Normalizer\NormalizableInterface; -use Symfony\Component\Serializer\Normalizer\NormalizerInterface; -use Tightenco\Collect\Support\Arr; /** * Class Stop * * @package App\Model */ -class Stop implements Referable, Fillable, NormalizableInterface +class Stop implements Referable, Fillable { use FillTrait, ReferableTrait; @@ -138,9 +134,4 @@ class Stop implements Referable, Fillable, NormalizableInterface { $this->onDemand = $onDemand; } - - public function normalize(NormalizerInterface $normalizer, $format = null, array $context = []) - { - return Arr::except($normalizer->normalize($this), ['latitude', 'longitude']); - } } \ No newline at end of file diff --git a/symfony.lock b/symfony.lock index 84a5881..7dae263 100644 --- a/symfony.lock +++ b/symfony.lock @@ -301,6 +301,9 @@ "symfony/process": { "version": "v4.1.3" }, + "symfony/profiler-pack": { + "version": "v1.0.4" + }, "symfony/property-access": { "version": "v4.1.3" }, @@ -358,6 +361,20 @@ "symfony/var-exporter": { "version": "v5.0.2" }, + "symfony/web-profiler-bundle": { + "version": "3.3", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "master", + "version": "3.3", + "ref": "6bdfa1a95f6b2e677ab985cd1af2eae35d62e0f6" + }, + "files": [ + "config/packages/dev/web_profiler.yaml", + "config/packages/test/web_profiler.yaml", + "config/routes/dev/web_profiler.yaml" + ] + }, "symfony/web-server-bundle": { "version": "3.3", "recipe": { diff --git a/yarn.lock b/yarn.lock index 73ca74d..08e47bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5917,10 +5917,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^3.0.1: - version "3.7.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.3.tgz#b36840668a16458a7025b9eabfad11b66ab85c69" - integrity sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw== +typescript@^3.6: + version "3.7.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.4.tgz#1743a5ec5fef6a1fa9f3e4708e33c81c73876c19" + integrity sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw== unbzip2-stream@^1.0.9: version "1.3.3"