tests: fix in Map.php fromArray()

run yarn workspace

fix: js tests

yarn build

yarn build

fix phpcs

yarn build

Author: sblondeau

src/Autocomplete/assets/dist/controller.js

@@ -1,32 +1,32 @@
 import { Controller } from '@hotwired/stimulus';
 import TomSelect from 'tom-select';
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
-
-
-function __classPrivateFieldGet(receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+/* global Reflect, Promise, SuppressedError, Symbol */
+
+
+function __classPrivateFieldGet(receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
 var _default_1_instances, _default_1_getCommonConfig, _default_1_createAutocomplete, _default_1_createAutocompleteWithHtmlContents, _default_1_createAutocompleteWithRemoteData, _default_1_stripTags, _default_1_mergeObjects, _default_1_createTomSelect;

src/Map/CHANGELOG.md

@@ -6,10 +6,6 @@
 -   Add `ux_map.google_maps.default_map_id` configuration to set the Google ``Map ID``
 -   Add `Polyline` support
 
-## 2.22
-
--   Add `Polyline` support
-
 ## 2.20
 
 -   Deprecate `render_map` Twig function (will be removed in 2.21). Use 

src/Map/src/Bridge/Leaflet/assets/dist/map_controller.js

@@ -0,0 +1,90 @@
+import AbstractMapController from '@symfony/ux-map';
+import 'leaflet/dist/leaflet.min.css';
+import * as L from 'leaflet';
+
+class map_controller extends AbstractMapController {
+    connect() {
+        L.Marker.prototype.options.icon = L.divIcon({
+            html: '<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" fill-rule="evenodd" stroke-linecap="round" clip-rule="evenodd" viewBox="0 0 500 820"><defs><linearGradient id="__sf_ux_map_gradient_marker_fill" x1="0" x2="1" y1="0" y2="0" gradientTransform="matrix(0 -37.57 37.57 0 416.45 541)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#126FC6"/><stop offset="1" stop-color="#4C9CD1"/></linearGradient><linearGradient id="__sf_ux_map_gradient_marker_border" x1="0" x2="1" y1="0" y2="0" gradientTransform="matrix(0 -19.05 19.05 0 414.48 522.49)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2E6C97"/><stop offset="1" stop-color="#3883B7"/></linearGradient></defs><circle cx="252.31" cy="266.24" r="83.99" fill="#fff"/><path fill="url(#__sf_ux_map_gradient_marker_fill)" stroke="url(#__sf_ux_map_gradient_marker_border)" stroke-width="1.1" d="M416.54 503.61c-6.57 0-12.04 5.7-12.04 11.87 0 2.78 1.56 6.3 2.7 8.74l9.3 17.88 9.26-17.88c1.13-2.43 2.74-5.79 2.74-8.74 0-6.18-5.38-11.87-11.96-11.87Zm0 7.16a4.69 4.69 0 1 1-.02 9.4 4.69 4.69 0 0 1 .02-9.4Z" transform="translate(-7889.1 -9807.44) scale(19.54)"/></svg>',
+            iconSize: [25, 41],
+            iconAnchor: [12.5, 41],
+            popupAnchor: [0, -41],
+            className: '',
+        });
+        super.connect();
+    }
+    dispatchEvent(name, payload = {}) {
+        this.dispatch(name, {
+            prefix: 'ux:map',
+            detail: {
+                ...payload,
+                L,
+            },
+        });
+    }
+    doCreateMap({ center, zoom, options, }) {
+        const map = L.map(this.element, {
+            ...options,
+            center: center === null ? undefined : center,
+            zoom: zoom === null ? undefined : zoom,
+        });
+        L.tileLayer(options.tileLayer.url, {
+            attribution: options.tileLayer.attribution,
+            ...options.tileLayer.options,
+        }).addTo(map);
+        return map;
+    }
+    doCreateMarker(definition) {
+        const { position, title, infoWindow, extra, rawOptions = {}, ...otherOptions } = definition;
+        const marker = L.marker(position, { title, ...otherOptions, ...rawOptions }).addTo(this.map);
+        if (infoWindow) {
+            this.createInfoWindow({ definition: infoWindow, element: marker });
+        }
+        return marker;
+    }
+    doCreatePolygon(definition) {
+        const { points, title, infoWindow, rawOptions = {} } = definition;
+        const polygon = L.polygon(points, { ...rawOptions }).addTo(this.map);
+        if (title) {
+            polygon.bindPopup(title);
+        }
+        if (infoWindow) {
+            this.createInfoWindow({ definition: infoWindow, element: polygon });
+        }
+        return polygon;
+    }
+    doCreatePolyline(definition) {
+        const { points, title, infoWindow, rawOptions = {} } = definition;
+        const polyline = L.polyline(points, { ...rawOptions }).addTo(this.map);
+        if (title) {
+            polyline.bindPopup(title);
+        }
+        if (infoWindow) {
+            this.createInfoWindow({ definition: infoWindow, element: polyline });
+        }
+        return polyline;
+    }
+    doCreateInfoWindow({ definition, element, }) {
+        const { headerContent, content, rawOptions = {}, ...otherOptions } = definition;
+        element.bindPopup([headerContent, content].filter((x) => x).join('<br>'), { ...otherOptions, ...rawOptions });
+        if (definition.opened) {
+            element.openPopup();
+        }
+        const popup = element.getPopup();
+        if (!popup) {
+            throw new Error('Unable to get the Popup associated with the element.');
+        }
+        return popup;
+    }
+    doFitBoundsToMarkers() {
+        if (this.markers.length === 0) {
+            return;
+        }
+        this.map.fitBounds(this.markers.map((marker) => {
+            const position = marker.getLatLng();
+            return [position.lat, position.lng];
+        }));
+    }
+}
+
+export { map_controller as default };

src/Map/src/Map.php

@@ -107,13 +107,6 @@ public function addPolyline(Polyline $polyline): self
         return $this;
     }
 
-    public function addPolyline(Polyline $polyline): self
-    {
-        $this->polylines[] = $polyline;
-
-        return $this;
-    }
-
     public function toArray(): array
     {
         if (!$this->fitBoundsToMarkers) {

src/Map/src/Twig/MapRuntime.php

@@ -64,9 +64,6 @@ public function renderMap(
         foreach ($polylines ?? [] as $polyline) {
             $map->addPolyline(Polyline::fromArray($polyline));
         }
-        foreach ($polylines ?? [] as $polylines) {
-            $map->addPolyline(Polyline::fromArray($polylines));
-        }
         if (null !== $center) {
             $map->center(Point::fromArray($center));
         }