diff --git a/.docker/Dockerfile b/.docker/Dockerfile new file mode 100644 index 00000000..2d155830 --- /dev/null +++ b/.docker/Dockerfile @@ -0,0 +1,753 @@ +FROM ubuntu:18.04 + +# remember build-date +RUN date >/build-date.txt && \ + mkdir -p /var/www && \ + mkdir -p /var/www/scripts + + +## *********************************************************************** +## IMAGE VARIABLES +## *********************************************************************** +ENV TZ Europe/Amsterdam +ENV PHP_VERSION 7.4 +ENV APACHE_DOCROOT /var/www/html/public/tests/Application/public +ENV COMPOSER_VERSION not-set +ENV NODE_VERSION 12 +ENV SHOP_DOMAIN localhost +RUN echo "export TZ=${TZ}" >> /etc/profile \ + && echo "export PHP_VERSION=${PHP_VERSION}" >> /etc/profile \ + && echo "export APACHE_DOCROOT=${APACHE_DOCROOT}" >> /etc/profile \ + && echo "export COMPOSER_VERSION=${COMPOSER_VERSION}" >> /etc/profile \ + && echo "export NODE_VERSION=${NODE_VERSION}" >> /etc/profile \ + && echo "export SHOP_DOMAIN=${SHOP_DOMAIN}" >> /etc/profile + +ENV SSH_USER not-set +ENV SSH_PWD not-set +ENV XDEBUG_REMOTE_HOST "host.docker.internal" +ENV XDEBUG_CONFIG "idekey=PHPSTORM" +ENV PHP_IDE_CONFIG "serverName=localhost" +ENV XDEBUG_ENABLED 0 + +RUN echo "export SSH_USER=${SSH_USER}" >> /etc/profile \ + && echo "export SSH_PWD=${SSH_PWD}" >> /etc/profile \ + && echo "export XDEBUG_ENABLED=${XDEBUG_ENABLED}" >> /etc/profile \ + && echo "export XDEBUG_REMOTE_HOST=${XDEBUG_REMOTE_HOST}" >> /etc/profile \ + && echo "export XDEBUG_CONFIG=${XDEBUG_CONFIG}" >> /etc/profile \ + && echo "export PHP_IDE_CONFIG=${PHP_IDE_CONFIG}" >> /etc/profile + +ENV MYSQL_USER not-set +ENV MYSQL_PWD not-set +RUN echo "export MYSQL_USER=${MYSQL_USER}" >> /etc/profile \ + && echo "export MYSQL_PWD=${MYSQL_PWD}" >> /etc/profile + +## *********************************************************************** +## BASE REQUIREMENTS +## *********************************************************************** +RUN apt-get update \ + && apt-get install -y gosu \ + && apt-get install -y sudo \ + && apt-get install -y wget \ + && apt-get install -y curl \ + && apt-get install -y unzip \ + && apt-get install -y bzip2 \ + && apt-get install -y gdebi-core \ + && apt-get install -y ssmtp \ + && apt-get install -y lsof \ + && apt-get install -y openssh-server \ + && apt-get install -y cron \ + && apt-get install -y vim \ + && apt-get install -y libnss3-tools \ + && apt-get install -y nano \ + && apt-get install -y jq \ + && apt-get install -y gnupg2 \ + && apt-get install -y gpg-agent \ + && apt-get install -y chromium-browser \ + && mkdir /var/run/sshd \ + && wget https://github.com/wkhtmltopdf/wkhtmltopdf/releases/download/0.12.4/wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \ + && tar vxf wkhtmltox-0.12.4_linux-generic-amd64.tar.xz -C /usr/local/bin \ + && rm -rf wkhtmltox-0.12.4_linux-generic-amd64.tar.xz \ + # TIMEZONE SETTINGS + # otherwise we would have an interactive input dialog + && ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime \ + && apt-get install -y tzdata \ + && dpkg-reconfigure --frontend noninteractive tzdata \ + \ + && apt-get install -y xdg-utils \ + && apt-get install -y libsodium-dev \ + && apt-get install -y php-dev \ + && apt-get install -y php-pear \ + && pecl install -f libsodium \ + && curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.deb.sh' | sudo -E bash \ + && apt-get remove -y php-pear \ + && apt-get remove -y php-dev \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +## *********************************************************************** +## USER MANAGEMENT +## *********************************************************************** +# set easy root pwd for dev purpose +RUN echo "root:root" | chpasswd \ + # set password for www-data, and also + # avoid shell login (we have a separate user for that) + && echo 'www-data:www-data' | chpasswd \ + && usermod -s /usr/sbin/nologin www-data \ + # this option makes sure to avoid root SSH login + # we just replace our lines with nothing + && sed -i 's/PermitRootLogin without-password//' /etc/ssh/sshd_config \ + && sed -i 's/PermitRootLogin prohibit-password//' /etc/ssh/sshd_config \ + # allow root and sudo group to run sudo without password + && sed -i /etc/sudoers -re 's/^%sudo.*/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g' \ + && sed -i /etc/sudoers -re 's/^root.*/root ALL=(ALL:ALL) NOPASSWD: ALL/g' \ + # remove include directory + && sed -i /etc/sudoers -re 's/^#includedir.*/## **Removed the include directive** ##"/g' + +## *********************************************************************** +## creates a new user as www-data alias and adds it to the sudo group +## along with privileges to run sudo without password +## params: +# - string user +# - string pwd +# - bool sudo +## *********************************************************************** +RUN adduser --disabled-password --uid 5577 --gecos "" --ingroup www-data mollie \ + && usermod -m -d /var/www mollie | true \ + && echo "mollie:mollie" | chpasswd \ + && usermod -a -G sudo mollie \ + # allow sudo without pwd and dont require tty (for entrypoint commands) + && echo "Defaults:mollie !requiretty" >> /etc/sudoers \ + && sed -i 's/mollie:x:5577:33:/mollie:x:33:33:/g' /etc/passwd +RUN echo 'AllowUsers mollie' >> /etc/ssh/sshd_config + +ENV BASH_ENV /var/www/.bashrc + +RUN echo "source /var/www/.nvm/nvm.sh" >> /var/www/.bashrc \ + # ------------------------------------------------- + && chown 33:33 /var/www/.bashrc \ + # ------------------------------------------------- + && echo "export BASH_ENV=${BASH_ENV}" >> /etc/profile + +## *********************************************************************** +## APACHE INSTALLATION +## *********************************************************************** +#this conf is needed for enconf command ... +ADD ./config/apache/http2.conf /etc/apache2/conf-available/http2.conf + +RUN apt-get update \ + && apt-get install -y apache2 \ + && apt-get install -y libapache2-mod-fcgid \ + && apt-get install -y software-properties-common \ + && LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php \ + && a2enmod headers \ + && a2enmod rewrite \ + && a2enmod expires \ + && a2enmod proxy \ + && a2enmod proxy_http \ + && a2enmod proxy_wstunnel \ + && a2enmod actions \ + && a2enmod fcgid \ + && a2enmod alias \ + && a2enmod proxy_fcgi \ + && a2enmod http2 \ + && sudo a2enconf http2 \ + && sudo a2dismod mpm_prefork > /dev/null 2>&1 \ + && sudo a2enmod mpm_event > /dev/null 2>&1 \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +ADD ./config/apache/apache2.conf /etc/apache2/apache2.conf +ADD ./config/apache/ports.conf /etc/apache2/ports.conf +ADD ./config/apache/sites.conf /etc/apache2/sites-enabled/000-default.conf + +# create a new id_rsa for the www-data dockeruser. +# thus we have a SSH Key for connections out of the box + +RUN mkdir -p /var/www/.ssh \ + && rm -rf /var/www/.ssh/id_rsa; true \ + && rm -rf /var/www/.ssh/id_rsa.pub; true \ + && ssh-keygen -t rsa -b 4096 -f /var/www/.ssh/id_rsa -C "MOLLIE Container" -P "" \ + && chown -R www-data:www-data /var/www/.ssh \ + && chmod 0700 /var/www/.ssh + +## *********************************************************************** +## PHP INSTALLATION +## *********************************************************************** +RUN apt-get update \ + && apt-get install -y php8.2-fpm \ + && apt-get install -y php8.2-gd \ + && apt-get install -y php8.2-iconv \ + && apt-get install -y php8.2-intl \ + && apt-get install -y php8.2-xml \ + && apt-get install -y php8.2-mbstring \ + && apt-get install -y php8.2-pdo \ + && apt-get install -y php8.2-mysql \ + && apt-get install -y php8.2-curl \ + && apt-get install -y php8.2-cli \ + && apt-get install -y php8.2-ldap \ + && apt-get install -y php8.2-pgsql \ + && apt-get install -y php8.2-gettext \ + && apt-get install -y php8.2-zip \ + && apt-get install -y php8.2-soap \ + && apt-get install -y php8.2-bcmath \ + && apt-get install -y php8.2-imap \ + && apt-get install -y php8.2-sqlite3 \ + && apt-get install -y dh-php \ + && apt-get install -y libpcre3 libpcre3-dev \ + # remove pecl again + && apt-get remove -y dh-php \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +COPY ./config/php/general.ini /etc/php/8.2/fpm/conf.d/01-general.ini +COPY ./config/php/general.ini /etc/php/8.2/cli/conf.d/01-general.ini +COPY ./config/php/cli.ini /etc/php/8.2/cli/conf.d/01-general-cli.ini + +RUN apt-get update \ + && apt-get install -y php8.1-fpm \ + && apt-get install -y php8.1-gd \ + && apt-get install -y php8.1-iconv \ + && apt-get install -y php8.1-intl \ + #&& apt-get install -y php8.1-json \ + && apt-get install -y php8.1-xml \ + && apt-get install -y php8.1-mbstring \ + && apt-get install -y php8.1-pdo \ + && apt-get install -y php8.1-mysql \ + && apt-get install -y php8.1-apc \ + && apt-get install -y php8.1-apcu \ + && apt-get install -y php8.1-curl \ + && apt-get install -y php8.1-cli \ + && apt-get install -y php8.1-ldap \ + && apt-get install -y php8.1-pgsql \ + && apt-get install -y php8.1-gettext \ + && apt-get install -y php8.1-zip \ + && apt-get install -y php8.1-soap \ + && apt-get install -y php8.1-bcmath \ + && apt-get install -y php8.1-redis \ + && apt-get install -y php8.1-imap \ + && apt-get install -y php8.1-ssh2 \ + && apt-get install -y php8.1-pcov \ + && apt-get install -y php8.1-sqlite3 \ + && apt-get install -y dh-php \ + #&& apt-get install -y php8.1-geoip \ not available for 8.1 + && apt-get install -y php8.1-amqp \ + && apt-get install -y libpcre3 libpcre3-dev \ + # remove pecl again + && apt-get remove -y dh-php \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +COPY ./config/php/general.ini /etc/php/8.1/fpm/conf.d/01-general.ini +COPY ./config/php/general.ini /etc/php/8.1/cli/conf.d/01-general.ini +COPY ./config/php/cli.ini /etc/php/8.1/cli/conf.d/01-general-cli.ini + +RUN apt-get update \ + && apt-get install -y php8.0-fpm \ + && apt-get install -y php8.0-gd \ + && apt-get install -y php8.0-iconv \ + && apt-get install -y php8.0-intl \ + #&& apt-get install -y php8.0-json \ + && apt-get install -y php8.0-xml \ + && apt-get install -y php8.0-mbstring \ + && apt-get install -y php8.0-pdo \ + && apt-get install -y php8.0-mysql \ + && apt-get install -y php8.0-apc \ + && apt-get install -y php8.0-apcu \ + && apt-get install -y php8.0-curl \ + && apt-get install -y php8.0-cli \ + && apt-get install -y php8.0-ldap \ + && apt-get install -y php8.0-pgsql \ + && apt-get install -y php8.0-gettext \ + && apt-get install -y php8.0-zip \ + && apt-get install -y php8.0-soap \ + && apt-get install -y php8.0-bcmath \ + && apt-get install -y php8.0-redis \ + && apt-get install -y php8.0-imap \ + && apt-get install -y php8.0-ssh2 \ + && apt-get install -y php8.0-pcov \ + && apt-get install -y dh-php \ +# && apt-get install -y php8.0-geoip \ not available for 8.0 + && apt-get install -y php8.0-amqp \ + && apt-get install -y php8.0-sqlite3 \ + && apt-get install -y libpcre3 libpcre3-dev \ + # remove pecl again + && apt-get remove -y dh-php \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +COPY ./config/php/general.ini /etc/php/8.0/fpm/conf.d/01-general.ini +COPY ./config/php/general.ini /etc/php/8.0/cli/conf.d/01-general.ini +COPY ./config/php/cli.ini /etc/php/8.0/cli/conf.d/01-general-cli.ini + +RUN apt-get update \ + && apt-get install -y php7.4-fpm \ + && apt-get install -y php7.4-gd \ + && apt-get install -y php7.4-mbstring \ + && apt-get install -y php7.4-iconv \ + && apt-get install -y php7.4-intl \ + && apt-get install -y php7.4-json \ + && apt-get install -y php7.4-xml \ + && apt-get install -y php7.4-pdo \ + && apt-get install -y php7.4-mysql \ + && apt-get install -y php7.4-apcu \ + && apt-get install -y php7.4-apc \ + && apt-get install -y php7.4-curl \ + && apt-get install -y php7.4-cli \ + && apt-get install -y php7.4-ldap \ + && apt-get install -y php7.4-pgsql \ + && apt-get install -y php7.4-gettext \ + && apt-get install -y php7.4-zip \ + && apt-get install -y php7.4-soap \ + && apt-get install -y php7.4-bcmath \ + && apt-get install -y php7.4-redis \ + && apt-get install -y php7.4-imap \ + && apt-get install -y php7.4-ssh2 \ + && apt-get install -y php7.4-pcov \ + && apt-get install -y dh-php \ + && apt-get install -y php7.4-geoip \ + && apt-get install -y php7.4-amqp \ + && apt-get install -y libpcre3 libpcre3-dev \ + # remove pecl again + && apt-get remove -y dh-php \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +COPY ./config/php/general.ini /etc/php/7.4/fpm/conf.d/01-general.ini +COPY ./config/php/general.ini /etc/php/7.4/cli/conf.d/01-general.ini +COPY ./config/php/cli.ini /etc/php/7.4/cli/conf.d/01-general-cli.ini + +#make sure the installation runs also in default php version +RUN sudo update-alternatives --set php /usr/bin/php7.4 > /dev/null 2>&1 & +# make sure the installation runs using our default php version +RUN service php7.4-fpm stop > /dev/null 2>&1 && \ + service php7.4-fpm start && \ + sudo update-alternatives --set php /usr/bin/php7.4 > /dev/null 2>&1 + +# make sure our php user has rights on the session +RUN chown www-data:www-data -R /var/lib/php/sessions + +# remove the standard apache index file +RUN mkdir -p /var/www/html \ + && rm -rf /var/www/html/* \ + && chown -R www-data:www-data /var/www/html \ + && sudo -u www-data sh -c 'mkdir -p /var/www/html/public' + +# make sure the configured log folder exists and is writeable +RUN chmod -R 0777 /var/www \ + && chgrp -R www-data /var/log/apache2 \ + && mkdir -p /var/log/mysql \ + && chgrp -R www-data /var/log/mysql\ + && mkdir /var/log/php -p \ + && touch /var/log/php/cli_errors.log \ + && touch /var/log/php/fpm_errors.log \ + && chown -R www-data:www-data /var/log/php \ + && chmod 0755 /var/log/php + +## *********************************************************************** +## MOD_SSL +## create SSL certificate +## *********************************************************************** +RUN apt-get update \ + && apt-get install -y openssl \ + && a2enmod ssl \ + && mkdir /etc/apache2/ssl \ + && openssl req -new -x509 -days 365 -sha1 -newkey rsa:2048 -nodes -keyout /etc/apache2/ssl/server.key -out /etc/apache2/ssl/server.crt -subj '/O=Company/OU=Department/CN=localhost' \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +RUN apt-get update \ + && apt-get install -y rsync \ + && apt-get install -y sshpass \ + && apt-get install -y jpegoptim \ + && apt-get install -y screen \ + && apt-get install -y mysql-client \ + && apt-get install -y git + +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/tmp --version=2.2.9 --quiet \ + # prepare "global" composer directory for www-data + && mkdir -p /var/www/.composer \ + && export COMPOSER_HOME="/var/www/.composer" \ + && chmod 755 /tmp/composer.phar \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +RUN mv /tmp/composer.phar /usr/local/bin/composer + +RUN cd /var/www \ + && apt-get update \ + # install xdebug for php 8.2 + && sudo apt-get install -y php8.2-dev \ + && cd /var/www \ + && rm -rf xdebug \ + && wget https://github.com/xdebug/xdebug/archive/refs/tags/3.2.0.zip \ + && unzip 3.2.0.zip \ + && rm -rf 3.2.0.zip \ + && mv xdebug-3.2.0 xdebug \ + && cd /var/www/xdebug \ + && sudo apt-get update \ + && sudo phpize8.2 \ + && sudo ./configure --with-php-config=/usr/bin/php-config8.2 \ + && sudo make \ + && sudo cp /var/www/xdebug/modules/xdebug.so /usr/lib/php/20220829/xdebug_8.2.so \ + && make clean \ + && make distclean \ + && sudo phpize8.2 --clean \ + && sudo apt-get remove -y php8.2-dev \ + # install xdebug for php 8.1 + && sudo apt-get install -y php8.1-dev \ + && cd /var/www \ + && rm -rf xdebug \ + && wget https://github.com/xdebug/xdebug/archive/refs/tags/3.1.4.zip \ + && unzip 3.1.4.zip \ + && rm -rf 3.1.4.zip \ + && mv xdebug-3.1.4 xdebug \ + && cd /var/www/xdebug \ + && sudo apt-get update \ + && sudo phpize8.1 \ + && sudo ./configure --with-php-config=/usr/bin/php-config8.1 \ + && sudo make \ + && sudo cp /var/www/xdebug/modules/xdebug.so /usr/lib/php/20210902/xdebug_8.1.so \ + && make clean \ + && make distclean \ + && sudo phpize8.1 --clean \ + && sudo apt-get remove -y php8.1-dev \ + # install xdebug for php 8.0 + && sudo apt-get install -y php8.0-dev \ + && cd /var/www \ + && rm -rf xdebug \ + && wget https://github.com/xdebug/xdebug/archive/refs/tags/3.1.4.zip \ + && unzip 3.1.4.zip \ + && rm -rf 3.1.4.zip \ + && mv xdebug-3.1.4 xdebug \ + && cd /var/www/xdebug \ + && sudo apt-get update \ + && sudo phpize8.0 \ + && sudo ./configure --with-php-config=/usr/bin/php-config8.0 \ + && sudo make \ + && sudo cp /var/www/xdebug/modules/xdebug.so /usr/lib/php/20200930/xdebug_8.0.so \ + && make clean \ + && make distclean \ + && sudo phpize8.0 --clean \ + && sudo apt-get remove -y php8.0-dev \ + # install xdebug for php 7.4 + && sudo apt-get install -y php7.4-dev \ + && cd /var/www \ + && rm -rf xdebug \ + && wget https://github.com/xdebug/xdebug/archive/refs/tags/3.1.4.zip \ + && unzip 3.1.4.zip \ + && rm -rf 3.1.4.zip \ + && mv xdebug-3.1.4 xdebug \ + && cd /var/www/xdebug \ + && sudo apt-get update \ + && sudo phpize7.4 \ + && sudo ./configure --with-php-config=/usr/bin/php-config7.4 \ + && sudo make \ + && sudo cp /var/www/xdebug/modules/xdebug.so /usr/lib/php/20190902/xdebug_7.4.so \ + && make clean \ + && make distclean \ + && sudo phpize7.4 --clean \ + && sudo apt-get remove -y php7.4-dev \ +&& sudo apt-get install -y zlib1g-dev \ +&& sudo rm -rf /var/lib/apt/lists/* /var/cache/apt/* \ +&& sudo rm -rf /var/www/xdebug + +#generate xdebug ini files + +COPY ./config/php/xdebug-3.ini /etc/php/8.2/fpm/conf.d/20-xdebug.ini +COPY ./config/php/xdebug-3.ini /etc/php/8.2/cli/conf.d/20-xdebug.ini + +COPY ./config/php/xdebug-3.ini /etc/php/8.1/fpm/conf.d/20-xdebug.ini +COPY ./config/php/xdebug-3.ini /etc/php/8.1/cli/conf.d/20-xdebug.ini + +COPY ./config/php/xdebug-3.ini /etc/php/8.0/fpm/conf.d/20-xdebug.ini +COPY ./config/php/xdebug-3.ini /etc/php/8.0/cli/conf.d/20-xdebug.ini + +COPY ./config/php/xdebug-3.ini /etc/php/7.4/fpm/conf.d/20-xdebug.ini +COPY ./config/php/xdebug-3.ini /etc/php/7.4/cli/conf.d/20-xdebug.ini + +RUN cd /var/www \ +&& sed -i 's/__PHP__FOLDER__ID/20220829/g' /etc/php/8.2/fpm/conf.d/20-xdebug.ini \ + && sed -i 's/__PHP_VERSION__/8.2/g' /etc/php/8.2/fpm/conf.d/20-xdebug.ini \ + && sed -i 's/__PHP__FOLDER__ID/20220829/g' /etc/php/8.2/cli/conf.d/20-xdebug.ini \ + && sed -i 's/__PHP_VERSION__/8.2/g' /etc/php/8.2/cli/conf.d/20-xdebug.ini \ +&& sed -i 's/__PHP__FOLDER__ID/20210902/g' /etc/php/8.1/fpm/conf.d/20-xdebug.ini \ + && sed -i 's/__PHP_VERSION__/8.1/g' /etc/php/8.1/fpm/conf.d/20-xdebug.ini \ + && sed -i 's/__PHP__FOLDER__ID/20210902/g' /etc/php/8.1/cli/conf.d/20-xdebug.ini \ + && sed -i 's/__PHP_VERSION__/8.1/g' /etc/php/8.1/cli/conf.d/20-xdebug.ini \ +&& sed -i 's/__PHP__FOLDER__ID/20200930/g' /etc/php/8.0/fpm/conf.d/20-xdebug.ini \ + && sed -i 's/__PHP_VERSION__/8.0/g' /etc/php/8.0/fpm/conf.d/20-xdebug.ini \ + && sed -i 's/__PHP__FOLDER__ID/20200930/g' /etc/php/8.0/cli/conf.d/20-xdebug.ini \ + && sed -i 's/__PHP_VERSION__/8.0/g' /etc/php/8.0/cli/conf.d/20-xdebug.ini \ +&& sed -i 's/__PHP__FOLDER__ID/20190902/g' /etc/php/7.4/fpm/conf.d/20-xdebug.ini \ + && sed -i 's/__PHP_VERSION__/7.4/g' /etc/php/7.4/fpm/conf.d/20-xdebug.ini \ + && sed -i 's/__PHP__FOLDER__ID/20190902/g' /etc/php/7.4/cli/conf.d/20-xdebug.ini \ + && sed -i 's/__PHP_VERSION__/7.4/g' /etc/php/7.4/cli/conf.d/20-xdebug.ini \ + && cd /var/www + +## *********************************************************************** +## MYSQL INSTALL +## *********************************************************************** + +# prepare environment variables to allow a +# quiet install of the mysql server +# this sets the root password to root without user prompts +RUN echo debconf mysql-server/root_password password root | debconf-set-selections +RUN echo debconf mysql-server/root_password_again password root | debconf-set-selections + +RUN DEBIAN_FRONTEND=noninteractive \ + # install mysql server + && apt-get update \ + && apt-get install -y -q mysql-server \ + # set requires permissions + && usermod -d /var/lib/mysql/ mysql \ + # cleanup download folders + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +# copy our custom configuration to the image +ADD ./config/mysql/my.cnf /etc/mysql/my.cnf + +# i dont know why, but this is suddenly required +RUN chmod 0444 /etc/mysql/my.cnf + +RUN service mysql start && \ + mysql --user=root --password=root -e "use mysql; update user set host='%' where host='localhost';" && \ + service mysql restart + +## *********************************************************************** +## ADMINER +## *********************************************************************** + +RUN mkdir /usr/share/adminer \ + && wget "https://github.com/vrana/adminer/releases/download/v4.8.1/adminer-4.8.1.php" -O /usr/share/adminer/latest.php \ + && ln -s /usr/share/adminer/latest.php /usr/share/adminer/adminer.php \ + && echo "Alias /adminer.php /usr/share/adminer/adminer.php" | sudo tee /etc/apache2/conf-available/adminer.conf \ + && a2enconf adminer.conf + +RUN apt-get update \ + && apt-get install -y build-essential \ + && apt-get install -y libsqlite3-dev \ + && apt-get install -y rubygems \ + && apt-get install -y ruby-dev \ + && gem install net-protocol -v 0.1.2 \ + && gem install net-smtp -v 0.3.0 \ + && gem install net-imap -v 0.2.2 \ + && gem install sqlite3 -v 1.3.4 \ + && gem install mailcatcher \ + && phpenmod mailcatcher \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +COPY ./config/ssmtp/ssmtp.conf /etc/ssmtp/ssmtp.conf +RUN echo "sendmail_path = /usr/bin/env $(which catchmail) -f 'local@mollie'" >> /etc/php/8.2/mods-available/mailcatcher.ini && \ +echo "sendmail_path = /usr/bin/env $(which catchmail) -f 'local@mollie'" >> /etc/php/8.1/mods-available/mailcatcher.ini && \ +echo "sendmail_path = /usr/bin/env $(which catchmail) -f 'local@mollie'" >> /etc/php/8.0/mods-available/mailcatcher.ini && \ +echo "sendmail_path = /usr/bin/env $(which catchmail) -f 'local@mollie'" >> /etc/php/7.4/mods-available/mailcatcher.ini && \ + echo "" + + +RUN apt-get update \ + && wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | apt-key add - \ + && apt-get install -y apt-transport-https \ + && echo "deb https://artifacts.elastic.co/packages/7.x/apt stable main" | tee -a /etc/apt/sources.list.d/elastic-7.x.list \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +RUN ls -la \ + && mkdir "/var/www/.nvm" \ + && export NVM_DIR="/var/www/.nvm" \ + # ----------------------------------------------------------------------------------------- + && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash \ + # ----------------------------------------------------------------------------------------- + && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" \ + && [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" \ + # ----------------------------------------------------------------------------------------- + && nvm install 16 \ + && nvm install 14 \ + && nvm install 12 \ + # ----------------------------------------------------------------------------------------- + # we have to install yarn in additional node versions + # otherwise it won't be found after a nvm switch + && nvm use 16 && npm install -g yarn @mockoon/cli \ + && nvm use 14 && npm install -g yarn @mockoon/cli \ + && nvm use 12 && npm install -g yarn @mockoon/cli \ + # ----------------------------------------------------------------------------------------- + && nvm use 14 \ + && nvm alias default 14 \ + # ----------------------------------------------------------------------------------------- + && echo "" + +ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules +ENV PATH $NVM_DIR/v$NODE_VERSION/bin:$PATH + +RUN echo "" \ + # ----------------------------------------------------------- + # we have to reload the correct nvm version otherwise this would destroy it + && export NVM_DIR="/var/www/.nvm" \ + && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" \ + && [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" \ + && nvm use 12 \ + # ----------------------------------------------------------- + && mkdir /var/www/.npm \ + && npm config set cache /var/www/.npm \ + && chown 33:33 /var/www/.npm \ + && cd /var/www && npm install -g grunt-cli \ + && cd /var/www && npm install grunt --save-dev \ + && npm install -g --no-install-recommends yarn \ + && chown -R www-data:www-data /var/www/.composer \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +RUN apt-get update \ + && apt-get install -y php8.2-fpm \ + && apt-get install -y php8.2-gd \ + && apt-get install -y php8.2-iconv \ + && apt-get install -y php8.2-intl \ + && apt-get install -y php8.2-xml \ + && apt-get install -y php8.2-mbstring \ + && apt-get install -y php8.2-pdo \ + && apt-get install -y php8.2-mysql \ + && apt-get install -y php8.2-curl \ + && apt-get install -y php8.2-cli \ + && apt-get install -y php8.2-ldap \ + && apt-get install -y php8.2-pgsql \ + && apt-get install -y php8.2-gettext \ + && apt-get install -y php8.2-zip \ + && apt-get install -y php8.2-soap \ + && apt-get install -y php8.2-bcmath \ + && apt-get install -y php8.2-imap \ + && apt-get install -y dh-php \ + && apt-get install -y libpcre3 libpcre3-dev \ + # remove pecl again + && apt-get remove -y dh-php \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +RUN apt-get update \ + && apt-get install -y php8.1-fpm \ + && apt-get install -y php8.1-gd \ + && apt-get install -y php8.1-iconv \ + && apt-get install -y php8.1-intl \ + #&& apt-get install -y php8.1-json \ + && apt-get install -y php8.1-xml \ + && apt-get install -y php8.1-mbstring \ + && apt-get install -y php8.1-pdo \ + && apt-get install -y php8.1-mysql \ + && apt-get install -y php8.1-apc \ + && apt-get install -y php8.1-apcu \ + && apt-get install -y php8.1-curl \ + && apt-get install -y php8.1-cli \ + && apt-get install -y php8.1-ldap \ + && apt-get install -y php8.1-pgsql \ + && apt-get install -y php8.1-gettext \ + && apt-get install -y php8.1-zip \ + && apt-get install -y php8.1-soap \ + && apt-get install -y php8.1-bcmath \ + && apt-get install -y php8.1-redis \ + && apt-get install -y php8.1-imap \ + && apt-get install -y php8.1-ssh2 \ + && apt-get install -y php8.1-pcov \ + && apt-get install -y php8.1-sqlite3 \ + && apt-get install -y dh-php \ + #&& apt-get install -y php8.1-geoip \ not available for 8.1 + && apt-get install -y php8.1-amqp \ + && apt-get install -y libpcre3 libpcre3-dev \ + # remove pecl again + && apt-get remove -y dh-php \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +RUN apt-get update \ + && apt-get install -y php8.0-fpm \ + && apt-get install -y php8.0-gd \ + && apt-get install -y php8.0-iconv \ + && apt-get install -y php8.0-intl \ + #&& apt-get install -y php8.0-json \ + && apt-get install -y php8.0-xml \ + && apt-get install -y php8.0-mbstring \ + && apt-get install -y php8.0-pdo \ + && apt-get install -y php8.0-mysql \ + && apt-get install -y php8.0-apc \ + && apt-get install -y php8.0-apcu \ + && apt-get install -y php8.0-curl \ + && apt-get install -y php8.0-cli \ + && apt-get install -y php8.0-ldap \ + && apt-get install -y php8.0-pgsql \ + && apt-get install -y php8.0-gettext \ + && apt-get install -y php8.0-zip \ + && apt-get install -y php8.0-soap \ + && apt-get install -y php8.0-bcmath \ + && apt-get install -y php8.0-redis \ + && apt-get install -y php8.0-imap \ + && apt-get install -y php8.0-ssh2 \ + && apt-get install -y php8.0-pcov \ + && apt-get install -y php8.0-sqlite3 \ + && apt-get install -y dh-php \ +# && apt-get install -y php8.0-geoip \ not available for 8.0 + && apt-get install -y php8.0-amqp \ + && apt-get install -y libpcre3 libpcre3-dev \ + # remove pecl again + && apt-get remove -y dh-php \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + + +RUN apt-get update \ + && apt-get install -y php7.4-fpm \ + && apt-get install -y php7.4-gd \ + && apt-get install -y php7.4-mbstring \ + && apt-get install -y php7.4-iconv \ + && apt-get install -y php7.4-intl \ + && apt-get install -y php7.4-json \ + && apt-get install -y php7.4-xml \ + && apt-get install -y php7.4-pdo \ + && apt-get install -y php7.4-mysql \ + && apt-get install -y php7.4-apcu \ + && apt-get install -y php7.4-apc \ + && apt-get install -y php7.4-curl \ + && apt-get install -y php7.4-cli \ + && apt-get install -y php7.4-ldap \ + && apt-get install -y php7.4-pgsql \ + && apt-get install -y php7.4-gettext \ + && apt-get install -y php7.4-zip \ + && apt-get install -y php7.4-soap \ + && apt-get install -y php7.4-bcmath \ + && apt-get install -y php7.4-redis \ + && apt-get install -y php7.4-imap \ + && apt-get install -y php7.4-ssh2 \ + && apt-get install -y php7.4-pcov \ + && apt-get install -y dh-php \ + && apt-get install -y php7.4-geoip \ + && apt-get install -y php7.4-amqp \ + && apt-get install -y php7.4-sqlite3 \ + && apt-get install -y libpcre3 libpcre3-dev \ + # remove pecl again + && apt-get remove -y dh-php \ + && wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \ + && apt install -y ./google-chrome-stable_current_amd64.deb \ + && rm ./google-chrome-stable_current_amd64.deb \ + && rm -rf /var/lib/apt/lists/* /var/cache/apt/* + +COPY ./assets/scripts/makefile /var/www/makefile +COPY ./assets/scripts/bin /var/www/scripts/bin + +RUN curl -sS https://get.symfony.com/cli/installer | bash +RUN mv /root/.symfony5/bin/symfony /usr/local/bin/symfony + + +RUN chown www-data:www-data -R /var/www/scripts +#make sure for the whole installation xdebug is off for performance +RUN sh /var/www/scripts/bin/xdebug_disable.sh + +ADD entrypoint.sh /entrypoint.sh +RUN chmod 755 /*.sh + +RUN chown 33:33 -R /var/www/html && \ + mkdir -p /var/www/.npm && chown 33:33 /var/www/.npm -R && \ + # this is necessary so that our user can + # change the default nvm node version + # otherwise the persisted node version switch would not work! + mkdir -p /var/www/.nvm && chown 33:33 /var/www/.nvm -R + +## *********************************************************************** +## SWITCH TO NORMAL USER (NOT ROOT ANYMORE!) +## everything down here is now done as our www-data / mollie user +## just like you would do it manually in the container +## *********************************************************************** + +USER mollie + +# make the apache folder the working directory +WORKDIR /var/www/html + +RUN symfony server:ca:install +## *********************************************************************** +## POST BUILD +## *********************************************************************** + +ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] diff --git a/.docker/Dockerfile.chromium b/.docker/Dockerfile.chromium new file mode 100644 index 00000000..398a76a2 --- /dev/null +++ b/.docker/Dockerfile.chromium @@ -0,0 +1,13 @@ +FROM debian:buster-slim + +RUN apt update && apt install -y chromium + +EXPOSE 9222 + +COPY ./start-chromium / + +RUN chmod +x /start-chromium + +ENTRYPOINT ["/start-chromium"] + +CMD [] diff --git a/.docker/assets/scripts/bin/status.sh b/.docker/assets/scripts/bin/status.sh new file mode 100644 index 00000000..96860f59 --- /dev/null +++ b/.docker/assets/scripts/bin/status.sh @@ -0,0 +1,15 @@ +echo apache2 status: +service apache2 status + +echo "" +echo "-----------------------------------------------" +echo 'php Version: ' ${PHP_VERSION} + +echo "" +echo "-----------------------------------------------" +echo 'fpm-Status: ' +service php${PHP_VERSION}-fpm status + +echo "" +echo "-----------------------------------------------" +echo 'php-cli infos' && php -v diff --git a/.docker/assets/scripts/bin/sylius_install.sh b/.docker/assets/scripts/bin/sylius_install.sh new file mode 100644 index 00000000..93db96aa --- /dev/null +++ b/.docker/assets/scripts/bin/sylius_install.sh @@ -0,0 +1,12 @@ +cd "$APACHE_DOCROOT/../../../" +composer install +cd tests/Application/ +composer install +php bin/console d:d:c --if-not-exists +php bin/console doctrine:schema:update -f +php bin/console sylius:fixtures:load -n +php bin/console assets:install +php bin/console sylius:install:assets +yarn install +yarn run gulp +yarn run build \ No newline at end of file diff --git a/.docker/assets/scripts/bin/xdebug_disable.sh b/.docker/assets/scripts/bin/xdebug_disable.sh new file mode 100644 index 00000000..b5618a50 --- /dev/null +++ b/.docker/assets/scripts/bin/xdebug_disable.sh @@ -0,0 +1,11 @@ +echo "mollie: deactivating Xdebug..." + +#make sure we use the current running php version and not that one from the ENV +PHP_VERSION_RUNNING=$(php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;') + +sudo mv /etc/php/${PHP_VERSION_RUNNING}/fpm/conf.d/20-xdebug.ini /etc/php/${PHP_VERSION_RUNNING}/fpm/conf.d/20-xdebug.ini_disabled > /dev/null 2>&1 & +sudo mv /etc/php/${PHP_VERSION_RUNNING}/cli/conf.d/20-xdebug.ini /etc/php/${PHP_VERSION_RUNNING}/cli/conf.d/20-xdebug.ini_disabled > /dev/null 2>&1 & +wait + +sudo service php${PHP_VERSION_RUNNING}-fpm restart > /dev/null 2>&1 & +echo "-----------------------------------------------------------" \ No newline at end of file diff --git a/.docker/assets/scripts/bin/xdebug_enable.sh b/.docker/assets/scripts/bin/xdebug_enable.sh new file mode 100644 index 00000000..332d7a8e --- /dev/null +++ b/.docker/assets/scripts/bin/xdebug_enable.sh @@ -0,0 +1,15 @@ +echo "mollie: activating Xdebug..." + +#make sure we use the current running php version and not that one from the ENV +PHP_VERSION_RUNNING=$(php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;') + +sudo mv /etc/php/${PHP_VERSION_RUNNING}/fpm/conf.d/20-xdebug.ini_disabled /etc/php/${PHP_VERSION_RUNNING}/fpm/conf.d/20-xdebug.ini > /dev/null 2>&1 & +sudo mv /etc/php/${PHP_VERSION_RUNNING}/cli/conf.d/20-xdebug.ini_disabled /etc/php/${PHP_VERSION_RUNNING}/cli/conf.d/20-xdebug.ini > /dev/null 2>&1 & +wait + +sudo sed -i 's/__mollie_host__/'${XDEBUG_REMOTE_HOST}'/g' /etc/php/${PHP_VERSION_RUNNING}/fpm/conf.d/20-xdebug.ini +sudo sed -i 's/__mollie_host__/'${XDEBUG_REMOTE_HOST}'/g' /etc/php/${PHP_VERSION_RUNNING}/cli/conf.d/20-xdebug.ini +wait + +sudo service php${PHP_VERSION}-fpm restart > /dev/null 2>&1 & +echo "------------------------------------------------" \ No newline at end of file diff --git a/.docker/assets/scripts/makefile b/.docker/assets/scripts/makefile new file mode 100644 index 00000000..4cbc2cde --- /dev/null +++ b/.docker/assets/scripts/makefile @@ -0,0 +1,59 @@ +.PHONY: help +.DEFAULT_GOAL := help + +PHP_VERSION_CURRENT=$(shell php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;') +XDEBUG_STATUS=$(shell php -r 'echo (int)extension_loaded("xdebug");') +help: + @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' + +status: ## status infos + sh /var/www/scripts/bin/status.sh + +xdebug-on: ## enables xdebug + sh /var/www/scripts/bin/xdebug_enable.sh + +xdebug-off: ## disables xdebug + sh /var/www/scripts/bin/xdebug_disable.sh + +sylius-install: ## disables xdebug + sh /var/www/scripts/bin/sylius_install.sh + +restart-php: ## Restarts FPM and Apache2 + sudo service php$(PHP_VERSION_CURRENT)-fpm stop + sudo service php$(PHP_VERSION_CURRENT)-fpm start + @# ------------------------------------------------------ + sudo service apache2 restart + +switch-php: ## Switches to another supported PHP version, [make switch-php version=7.4] +ifndef version + $(warning Provide the required PHP version using "make switch-php version=x.y") + @exit 1; +else + @# ATTENTION, keep this steps exactly like they are. they ensure that its fail-fast + @# non existing PHP versions will do nothing, switching to the same php version will also work + @# --------------------------------------------------------------------------------------- + @# Start new PHP to see if its existing, then stop current one, and if we use the same php version that + @# is currently used, just make sure to start it again ;) + sudo service php$(version)-fpm start + sudo service php$(PHP_VERSION_CURRENT)-fpm stop + sudo service php$(version)-fpm start + export PHP_VERSION=$(version) + @# --------------------------------------------------------------------------------------- + @# if that all worked, switch the apache config now...that avoids breaking the files + @# pipe the first command to dev/null to avoid ugly warnings in entrypoint boot script if old placeholder does not exist anymore + sudo sed -i 's/__mollie_php_version__/'$(version)'/g' /etc/apache2/sites-enabled/000-default.conf 2>/dev/null + sudo sed -i 's/'php$(PHP_VERSION_CURRENT)-fpm.sock'/'php$(version)-fpm.sock'/g' /etc/apache2/sites-enabled/000-default.conf + sudo service apache2 restart + @# --------------------------------------------------------------------------------------- + @# last but not least update php for cli -> this is used for our variable in here + sudo update-alternatives --set php /usr/bin/php$(version) + @# --------------------------------------------------------------------------------------- +ifeq ($(XDEBUG_STATUS),1) + make xdebug-on +else + make xdebug-off +endif + @# --------------------------------------------------------------------------------------- + php -v +endif + diff --git a/.docker/config/apache/apache2.conf b/.docker/config/apache/apache2.conf new file mode 100644 index 00000000..5e2aef1d --- /dev/null +++ b/.docker/config/apache/apache2.conf @@ -0,0 +1,216 @@ +# This is the main Apache server configuration file. It contains the +# configuration directives that give the server its instructions. +# See http://httpd.apache.org/docs/2.4/ for detailed information about +# the directives and /usr/share/doc/apache2/README.Debian about Debian specific +# hints. +# +# +# Summary of how the Apache 2 configuration works in Debian: +# The Apache 2 web server configuration in Debian is quite different to +# upstream's suggested way to configure the web server. This is because Debian's +# default Apache2 installation attempts to make adding and removing modules, +# virtual hosts, and extra configuration directives as flexible as possible, in +# order to make automating the changes and administering the server as easy as +# possible. + +# It is split into several files forming the configuration hierarchy outlined +# below, all located in the /etc/apache2/ directory: +# +# /etc/apache2/ +# |-- apache2.conf +# | `-- ports.conf +# |-- mods-enabled +# | |-- *.load +# | `-- *.conf +# |-- conf-enabled +# | `-- *.conf +# `-- sites-enabled +# `-- *.conf +# +# +# * apache2.conf is the main configuration file (this file). It puts the pieces +# together by including all remaining configuration files when starting up the +# web server. +# +# * ports.conf is always included from the main configuration file. It is +# supposed to determine listening ports for incoming connections which can be +# customized anytime. +# +# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/ +# directories contain particular configuration snippets which manage modules, +# global configuration fragments, or virtual host configurations, +# respectively. +# +# They are activated by symlinking available configuration files from their +# respective *-available/ counterparts. These should be managed by using our +# helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See +# their respective man pages for detailed information. +# +# * The binary is called apache2. Due to the use of environment variables, in +# the default configuration, apache2 needs to be started/stopped with +# /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not +# work with the default configuration. + +# Global configuration +# + +ServerName localhost + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# NOTE! If you intend to place this on an NFS (or otherwise network) +# mounted filesystem then please read the Mutex documentation (available +# at ); +# you will save yourself a lot of trouble. +# +# Do NOT add a slash at the end of the directory path. +# +#ServerRoot "/etc/apache2" + +# +# The accept serialization lock file MUST BE STORED ON A LOCAL DISK. +# +Mutex file:${APACHE_LOCK_DIR} default + +# +# PidFile: The file in which the server should record its process +# identification number when it starts. +# This needs to be set in /etc/apache2/envvars +# +PidFile ${APACHE_PID_FILE} + +# +# Timeout: The number of seconds before receives and sends time out. +# +Timeout 300 + +# +# KeepAlive: Whether or not to allow persistent connections (more than +# one request per connection). Set to "Off" to deactivate. +# +KeepAlive On + +# +# MaxKeepAliveRequests: The maximum number of requests to allow +# during a persistent connection. Set to 0 to allow an unlimited amount. +# We recommend you leave this number high, for maximum performance. +# +MaxKeepAliveRequests 100 + +# +# KeepAliveTimeout: Number of seconds to wait for the next request from the +# same client on the same connection. +# +KeepAliveTimeout 5 + +# These need to be set in /etc/apache2/envvars +User ${APACHE_RUN_USER} +Group ${APACHE_RUN_GROUP} + +# +# HostnameLookups: Log the names of clients or just their IP addresses +# e.g., www.apache.org (on) or 204.62.129.132 (off). +# The default is off because it'd be overall better for the net if people +# had to knowingly turn this feature on, since enabling it means that +# each client request will result in AT LEAST one lookup request to the +# nameserver. +# +HostnameLookups Off + +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog ${APACHE_LOG_DIR}/error.log + +# +# LogLevel: Control the severity of messages logged to the error_log. +# Available values: trace8, ..., trace1, debug, info, notice, warn, +# error, crit, alert, emerg. +# It is also possible to configure the log level for particular modules, e.g. +# "LogLevel info ssl:warn" +# +LogLevel warn + +# Include module configuration: +IncludeOptional mods-enabled/*.load +IncludeOptional mods-enabled/*.conf + +# Include list of ports to listen on +Include ports.conf + +# Sets the default security model of the Apache2 HTTPD server. It does +# not allow access to the root filesystem outside of /usr/share and /var/www. +# The former is used by web applications packaged in Debian, +# the latter may be used for local directories served by the web server. If +# your system is serving content from a sub-directory in /srv you must allow +# access here, or in any related virtual host. + + Options FollowSymLinks + AllowOverride None + Require all denied + + + + AllowOverride None + Require all granted + + + + Options Indexes FollowSymLinks + AllowOverride None + Require all granted + + +# +# Options Indexes FollowSymLinks +# AllowOverride None +# Require all granted +# + +# AccessFileName: The name of the file to look for in each directory +# for additional configuration directives. See also the AllowOverride +# directive. +# +AccessFileName .htaccess + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + +# +# The following directives define some format nicknames for use with +# a CustomLog directive. +# +# These deviate from the Common Log Format definitions in that they use %O +# (the actual bytes sent including headers) instead of %b (the size of the +# requested file), because the latter makes it impossible to detect partial +# requests. +# +# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended. +# Use mod_remoteip instead. +# +LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined +LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined +LogFormat "%h %l %u %t \"%r\" %>s %O" common +LogFormat "%{Referer}i -> %U" referer +LogFormat "%{User-agent}i" agent + +# Include of directories ignores editors' and dpkg's backup files, +# see README.Debian for details. + +# Include generic snippets of statements +IncludeOptional conf-enabled/*.conf + +# Include the virtual host configurations: +IncludeOptional sites-enabled/*.conf + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/.docker/config/apache/http2.conf b/.docker/config/apache/http2.conf new file mode 100644 index 00000000..e86f471b --- /dev/null +++ b/.docker/config/apache/http2.conf @@ -0,0 +1,4 @@ + + Protocols h2 h2c http/1.1 + H2Direct on + \ No newline at end of file diff --git a/.docker/config/apache/ports.conf b/.docker/config/apache/ports.conf new file mode 100644 index 00000000..6aedd9a5 --- /dev/null +++ b/.docker/config/apache/ports.conf @@ -0,0 +1,5 @@ +Listen 80 + + + Listen 443 + diff --git a/.docker/config/apache/sites.conf b/.docker/config/apache/sites.conf new file mode 100644 index 00000000..3c62db08 --- /dev/null +++ b/.docker/config/apache/sites.conf @@ -0,0 +1,62 @@ + + + ServerAdmin local@mollie + + ErrorLog /var/log/apache2/error.log + AccessFileName .htaccess.watch .htaccess + + DocumentRoot __mollie_apache_docroot__ + + + Options -Indexes + AllowOverride All + Require all granted + CGIPassAuth On + + + + # 2.4.10+ can proxy to unix socket + SetHandler "proxy:unix:/var/run/php/php__mollie_php_version__-fpm.sock|fcgi://localhost" + + + + ProxyPass http://localhost:1080 + ProxyPassReverse http://localhost:1080 + + + + + + + + ServerAdmin local@mollie + + ErrorLog /var/log/apache2/error.log + AccessFileName .htaccess.watch .htaccess + + SSLEngine On + SSLCertificateFile /etc/apache2/ssl/server.crt + SSLCertificateKeyFile /etc/apache2/ssl/server.key + + Protocols h2 h2c http/1.1 + + DocumentRoot __mollie_apache_docroot__ + + + # 2.4.10+ can proxy to unix socket + SetHandler "proxy:unix:/var/run/php/php__mollie_php_version__-fpm.sock|fcgi://localhost" + + + + Options -Indexes + AllowOverride All + Require all granted + CGIPassAuth On + + + + ProxyPass http://localhost:1080 + ProxyPassReverse http://localhost:1080 + + + diff --git a/.docker/config/mysql/my.cnf b/.docker/config/mysql/my.cnf new file mode 100644 index 00000000..b2f58f35 --- /dev/null +++ b/.docker/config/mysql/my.cnf @@ -0,0 +1,30 @@ + +[mysqld_safe] +socket = /var/run/mysqld/mysqld.sock +nice = 0 + +[mysqld] +user = mysql +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +port = 3306 +basedir = /usr +datadir = /var/lib/mysql +tmpdir = /tmp +lc-messages-dir = /usr/share/mysql +skip-external-locking + +bind-address = * +sql-mode=ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION + +key_buffer_size = 16M +max_allowed_packet = 16M +thread_stack = 192K +thread_cache_size = 8 +myisam-recover-options = BACKUP +query_cache_limit = 1M +query_cache_size = 16M + +log_error = /var/log/mysql/error.log +expire_logs_days = 10 +max_binlog_size = 100M diff --git a/.docker/config/mysql/my8.cnf b/.docker/config/mysql/my8.cnf new file mode 100644 index 00000000..299f6e29 --- /dev/null +++ b/.docker/config/mysql/my8.cnf @@ -0,0 +1,34 @@ +# +# * IMPORTANT: Additional settings that can override those from this file! +# The files must end with '.cnf', otherwise they'll be ignored. +# + +!includedir /etc/mysql/conf.d/ +!includedir /etc/mysql/mysql.conf.d/ + +#### mollie CREATED SETTINGS ###### +[mysqld_safe] +socket = /var/run/mysqld/mysqld.sock +nice = 0 + +[mysqld] +user = mysql +pid-file = /var/run/mysqld/mysqld.pid +socket = /var/run/mysqld/mysqld.sock +port = 3306 +basedir = /usr +datadir = /var/lib/mysql +tmpdir = /tmp +lc-messages-dir = /usr/share/mysql +skip-external-locking + +bind-address = 0.0.0.0 + +key_buffer_size = 16M +max_allowed_packet = 16M +thread_stack = 192K +thread_cache_size = 8 +myisam-recover-options = BACKUP +log_error = /var/log/mysql/error.log +expire_logs_days = 10 +max_binlog_size = 100M \ No newline at end of file diff --git a/.docker/config/php/apcu.ini b/.docker/config/php/apcu.ini new file mode 100644 index 00000000..7d8938c1 --- /dev/null +++ b/.docker/config/php/apcu.ini @@ -0,0 +1,6 @@ +; ============================================================= +; APCU SETTINGS +; ============================================================= +extension= apcu.so +apc.enabled= 1 +apc.enable_cli= 1 \ No newline at end of file diff --git a/.docker/config/php/cli.ini b/.docker/config/php/cli.ini new file mode 100644 index 00000000..7350f428 --- /dev/null +++ b/.docker/config/php/cli.ini @@ -0,0 +1,5 @@ +; ============================================================= +; PHP ERROR LOGS +; ============================================================= +error_log=/var/log/php/cli_errors.log +opcache.enable_cli=0 \ No newline at end of file diff --git a/.docker/config/php/general.ini b/.docker/config/php/general.ini new file mode 100644 index 00000000..b932775f --- /dev/null +++ b/.docker/config/php/general.ini @@ -0,0 +1,31 @@ +; ============================================================= +; PHP ERROR LOGS +; ============================================================= +error_log=/var/log/php/fpm_errors.log +display_errors = on +date.timezone = "Europe/Amsterdam" +; ============================================================= +; MIXED +; ============================================================= +max_execution_time=300 +memory_limit=2048M +post_max_size = 100M +upload_max_filesize = 100M +short_open_tag = Off + +; ============================================================= +; SENDMAIL +; ============================================================= +sendmail_path = /usr/sbin/ssmtp + +; ============================================================= +; OPCACHE +; ============================================================= +opcache.validate_root = 1 +opcache.enable=1 + +; ============================================================= +; SUHOSIN +; ============================================================= +[suhosin] +suhosin.simulation = On \ No newline at end of file diff --git a/.docker/config/php/pcov.ini b/.docker/config/php/pcov.ini new file mode 100644 index 00000000..cb8b23c9 --- /dev/null +++ b/.docker/config/php/pcov.ini @@ -0,0 +1,2 @@ +pcov.enabled = 1 +pcov.directory = /var/www/html \ No newline at end of file diff --git a/.docker/config/php/xdebug-3.ini b/.docker/config/php/xdebug-3.ini new file mode 100644 index 00000000..04a3a250 --- /dev/null +++ b/.docker/config/php/xdebug-3.ini @@ -0,0 +1,15 @@ +; ============================================================= +; XDEBUG +; ============================================================= +zend_extension = "/usr/lib/php/__PHP__FOLDER__ID/xdebug___PHP_VERSION__.so" +xdebug.idekey = "PHPSTORM" + +xdebug.mode = debug + +xdebug.client_port = 9000 +xdebug.remote_handler = dbgp +xdebug.client_host = __mollie_host__ +xdebug.var_display_max_depth = 99999 +xdebug.var_display_max_data = 999999 +xdebug.max_nesting_level = 9500 +xdebug.start_with_request = yes \ No newline at end of file diff --git a/.docker/config/ssmtp/ssmtp.conf b/.docker/config/ssmtp/ssmtp.conf new file mode 100644 index 00000000..ddf0f542 --- /dev/null +++ b/.docker/config/ssmtp/ssmtp.conf @@ -0,0 +1,10 @@ +# +# Config file for sSMTP sendmail +# + +root=postmaster + +mailhub=localhost:1025 + +# The full hostname +hostname=dab56e4251f0 diff --git a/.docker/entrypoint.sh b/.docker/entrypoint.sh new file mode 100644 index 00000000..fcb2eed7 --- /dev/null +++ b/.docker/entrypoint.sh @@ -0,0 +1,183 @@ +#!/bin/bash + +echo "68 69 20 64 65 76 65 6C 6F 70 65 72 2C 20 6E 69 63 65 20 74 6F 20 6D 65 65 74 20 79 6F 75" +echo "6c 6f 6f 6b 69 6e 67 20 66 6f 72 20 61 20 6a 6f 62 3f 20 77 72 69 74 65 20 75 73 20 61 74 20 6a 6f 62 73 40 64 61 73 69 73 74 77 65 62 2e 64 65" +echo "" +echo "*******************************************************" +echo "** Sylius Mollie IMAGE" +echo "*******************************************************" +echo "" +echo "launching docker...please wait..." +echo "" + +source /etc/apache2/envvars +source /var/www/.bashrc + +# this is important to automatically use the bashrc file +# in the "exec" command below when using a simple docker runner command +export BASH_ENV=/var/www/.bashrc + +CONTAINER_STARTUP_DIR=$(pwd) + +# it's possible to add a custom boot script on startup. +# so we test if it exists and just execute it +file="/var/www/boot_start.sh" +if [ -f "$file" ] ; then + sh $file +fi + +echo "MOLLIE: setting timezone to ${TZ}..." +sudo ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime +sudo dpkg-reconfigure -f noninteractive tzdata +echo "-----------------------------------------------------------" + +# checks if a different username is set in ENV and create if its not existing yet +if [ $SSH_USER != "not-set" ] && (! id -u "${SSH_USER}" >/dev/null 2>&1 ); then + echo "MOLLIE: creating additional SSH user...." + # create a custom ssh user for our provided settings + sudo adduser --disabled-password --uid 8888 --gecos "" --ingroup www-data $SSH_USER + sudo usermod -a -G sudo $SSH_USER + sudo usermod -m -d /var/www $SSH_USER | true + sudo echo "${SSH_USER}:${SSH_PWD}" | sudo chpasswd + sudo sed -i "s/${SSH_USER}:x:8888:33:/${SSH_USER}:x:33:33:/g" /etc/passwd + # add sudo without password + # write user to file cause we loos the var as we executing as root and get a new shell + sudo echo "${SSH_USER}" >> /tmp/user.name + sudo -u root sh -c 'echo "Defaults:$(cat /tmp/user.name) !requiretty" >> /etc/sudoers' + sudo rm -rf /tmp/user.name + # disable original ssh access + sudo usermod -s /bin/false mollie + # allow ssh in sshd_config + sudo sed -i "s/AllowUsers mollie/AllowUsers ${SSH_USER}/g" /etc/ssh/sshd_config + echo "-----------------------------------------------------------" +fi + +# start the SSH service with the latest setup +echo "MOLLIE: restarting SSH service...." +sudo service ssh restart +echo "-----------------------------------------------------------" + +echo "MOLLIE: starting MySQL...." +# somehow its necessary to set permissions, because +# sometimes they get lost :) +# make sure that it is no longer present from the last run +file="/var/run/mysqld/mysqld.sock.lock" +if [ -f "$file" ] ; then + sudo rm -f "$file" +fi + +sudo chown -R mysql:mysql /var/lib/mysql /var/run/mysqld +sudo service mysql start; + +if [ $MYSQL_USER != "not-set" ] && [ $MYSQL_PWD != "not-set" ]; then + echo "MOLLIE: creating new MySQL user...." + # ----------------------------------- + # block remote access for root user + sudo mysql --user=root --password=root -e "UPDATE mysql.user SET Host='localhost' WHERE User='root' AND Host='%';"; + # ----------------------------------- + # add new user and grant privileges + sudo mysql --user=root --password=root -e "CREATE USER IF NOT EXISTS '"$MYSQL_USER"'@'%' IDENTIFIED BY '"$MYSQL_PWD"';"; + sudo mysql --user=root --password=root -e "use mysql; update user set host='%' where user='$MYSQL_USER';"; + sudo mysql --user=root --password=root -e "GRANT ALL PRIVILEGES ON *.* TO '"$MYSQL_USER"'@'%' IDENTIFIED BY '$MYSQL_PWD';"; + # ----------------------------------- + # apply and flush privileges + sudo mysql --user=root --password=root -e "FLUSH PRIVILEGES;"; + echo "-----------------------------------------------------------" +fi +echo "-----------------------------------------------------------" + +echo "MOLLIE: starting mailcatcher...." +sudo /usr/bin/env $(which mailcatcher) --ip=0.0.0.0 +echo "-----------------------------------------------------------" + +echo "MOLLIE: starting cron service...." +sudo service cron start +echo "-----------------------------------------------------------" + +# -------------------------------------------------- +# APACHE +# first set the correct doc root, because we need it for the php switch below +sudo sed -i 's#__mollie_apache_docroot__#'${APACHE_DOCROOT}'#g' /etc/apache2/sites-enabled/000-default.conf +# -------------------------------------------------- + +echo "MOLLIE: switching to PHP ${PHP_VERSION}..." +cd /var/www && make switch-php version=${PHP_VERSION} +sudo service apache2 stop +echo "-----------------------------------------------------------" + +if [ $COMPOSER_VERSION = 1 ]; then + echo "MOLLIE: switching to composer 1..." + sudo composer self-update --1 + echo "-----------------------------------------------------------" +fi +if [ $COMPOSER_VERSION = 2 ]; then + echo "MOLLIE: switching to composer 2..." + sudo composer self-update --stable + echo "-----------------------------------------------------------" +fi + +# somehow we (once) had the problem that composer does not find a HOME directory +# this was the solution +export COMPOSER_HOME=/var/www + +if [ $XDEBUG_ENABLED = 1 ]; then + sh /var/www/scripts/bin/xdebug_enable.sh + else + sh /var/www/scripts/bin/xdebug_disable.sh +fi + +if [[ ! -z "$NODE_VERSION" ]]; then + echo "MOLLIE: switching to Node ${NODE_VERSION}..." + nvm alias default ${NODE_VERSION} + # now make sure to at least have node and npm as sudo + # nvm itself is not possible by design + sudo rm -f /usr/local/bin/node + sudo rm -f /usr/local/bin/npm + sudo ln -s "$(which node)" "/usr/local/bin/node" + sudo ln -s "$(which npm)" "/usr/local/bin/npm" + echo "-----------------------------------------------------------" +fi + +# -------------------------------------------------- +# APACHE +# sometimes the internal docker structure leaves +# some pid files existing. the container will be recreated....but +# in reality it's not! thus there might be the problem +# that an older pid file exists, which leads to the following error: +# - "httpd (pid 13) already running" +# to avoid this, we simple remove an existing file +sudo rm -f /var/run/apache2/apache2.pid +# also, sometimes port 80 is used? happens if you have lots of local containers i think +# so let's just kill that, otherwise the container won't start +sudo lsof -t -i tcp:80 | sudo xargs kill >/dev/null 2>&1 || true; + +# start test and start apache +echo "MOLLIE: testing and starting Apache..." +sudo apache2ctl configtest +sudo service apache2 restart +echo "-----------------------------------------------------------" + +echo "MOLLIE: Restarting dbus..." +sudo /etc/init.d/dbus restart +# before starting any commands +# we always need to ensure we are back in our +# configured WORKDIR of the container +echo "-----------------------------------------------------" +cd $CONTAINER_STARTUP_DIR + +# now let's check if we have a custom boot script that +# should run after our other startup scripts. +file="/var/www/boot_end.sh" +if [ -f "$file" ] ; then + chmod +x $file + sh $file +fi + +# always execute custom commands in here. +# if a custom command is provided, then the container +# will automatically exit after it. +# that's somehow just how it works. +# otherwise it will continue with the code below +exec "$@" + +tail -f /dev/null \ No newline at end of file diff --git a/.docker/nginx/conf.d/default.conf b/.docker/nginx/conf.d/default.conf deleted file mode 100644 index 41eb06d2..00000000 --- a/.docker/nginx/conf.d/default.conf +++ /dev/null @@ -1,40 +0,0 @@ -server { - root /var/www/tests/Application/public; - - location / { - # try to serve file directly, fallback to index.php - try_files $uri /index.php$is_args$args; - } - - location ~ ^/index\.php(/|$) { - # Comment the next line and uncomment the next to enable dynamic resolution (incompatible with Kubernetes) - fastcgi_pass php:9000; - #resolver 127.0.0.11; - #set $upstream_host php; - #fastcgi_pass $upstream_host:9000; - - fastcgi_split_path_info ^(.+\.php)(/.*)$; - include fastcgi_params; - # When you are using symlinks to link the document root to the - # current version of your application, you should pass the real - # application path instead of the path to the symlink to PHP - # FPM. - # Otherwise, PHP's OPcache may not properly detect changes to - # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126 - # for more information). - fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; - fastcgi_param DOCUMENT_ROOT $realpath_root; - # Prevents URIs that include the front controller. This will 404: - # http://domain.tld/index.php/some-path - # Remove the internal directive to allow URIs like this - internal; - } - - # return 404 for all other php files not matching the front controller - # this prevents access to other php files you don't want to be accessible. - location ~ \.php$ { - return 404; - } - - client_max_body_size 6m; -} diff --git a/.docker/nodejs/docker-entrypoint.sh b/.docker/nodejs/docker-entrypoint.sh deleted file mode 100644 index 9652169e..00000000 --- a/.docker/nodejs/docker-entrypoint.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -set -e - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- node "$@" -fi - -if [ "$1" = 'node' ] || [ "$1" = 'yarn' ]; then - yarn install - - >&2 echo "Waiting for PHP to be ready..." - until nc -z "$PHP_HOST" "$PHP_PORT"; do - sleep 1 - done -fi - -exec "$@" diff --git a/.docker/php/docker-entrypoint.sh b/.docker/php/docker-entrypoint.sh deleted file mode 100644 index b2c57cd6..00000000 --- a/.docker/php/docker-entrypoint.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -set -e - -pluginDirectory='/var/www'; -pluginApplicationDirectory='/var/www/tests/Application'; - -# first arg is `-f` or `--some-option` -if [ "${1#-}" != "$1" ]; then - set -- php-fpm "$@" -fi - -if [ "$1" = 'php-fpm' ] || [ "$1" = 'bin/console' ]; then - mkdir -p var/cache var/log public/media/image - setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX var public - setfacl -dR -m u:www-data:rwX -m u:"$(whoami)":rwX var public - - if [ "$APP_ENV" != 'prod' ]; then - composer install --prefer-dist --no-progress --no-interaction; - cd $pluginDirectory && composer install --prefer-dist --no-progress --no-interaction; - cd $pluginApplicationDirectory; - fi - - echo "Waiting for db to be ready..." - ATTEMPTS_LEFT_TO_REACH_DATABASE=60 - - cd $pluginApplicationDirectory; - - until [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ] || DATABASE_ERROR=$(php bin/console dbal:run-sql "SELECT 1" 2>&1); do - if [ $? -eq 255 ]; then - # If the Doctrine command exits with 255, an unrecoverable error occurred - ATTEMPTS_LEFT_TO_REACH_DATABASE=0 - break - fi - sleep 1 - ATTEMPTS_LEFT_TO_REACH_DATABASE=$((ATTEMPTS_LEFT_TO_REACH_DATABASE - 1)) - echo "Still waiting for db to be ready... Or maybe the db is not reachable. $ATTEMPTS_LEFT_TO_REACH_DATABASE attempts left" - done - - php bin/console doctrine:database:create --if-not-exists; - php bin/console doctrine:schema:update -f; -fi - -exec docker-php-entrypoint "$@" diff --git a/.docker/php/docker-healthcheck.sh b/.docker/php/docker-healthcheck.sh deleted file mode 100644 index f15b9985..00000000 --- a/.docker/php/docker-healthcheck.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - -export SCRIPT_NAME=/ping -export SCRIPT_FILENAME=/ping -export REQUEST_METHOD=GET - -if cgi-fcgi -bind -connect 127.0.0.1:9000; then - exit 0 -fi - -exit 1 diff --git a/.docker/php/php-cli.ini b/.docker/php/php-cli.ini deleted file mode 100644 index cbfffc77..00000000 --- a/.docker/php/php-cli.ini +++ /dev/null @@ -1,16 +0,0 @@ -apc.enable_cli = 1 -date.timezone = UTC -opcache.enable_cli = 1 -session.auto_start = Off -short_open_tag = Off - -# http://symfony.com/doc/current/performance.html -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 20000 -opcache.memory_consumption = 256 -realpath_cache_size = 4096K -realpath_cache_ttl = 600 - -memory_limit = 2G -post_max_size = 6M -upload_max_filesize = 5M diff --git a/.docker/php/php.ini b/.docker/php/php.ini deleted file mode 100644 index f36f9b26..00000000 --- a/.docker/php/php.ini +++ /dev/null @@ -1,15 +0,0 @@ -apc.enable_cli = 1 -date.timezone = UTC -opcache.enable_cli = 1 -session.auto_start = Off -short_open_tag = Off - -# http://symfony.com/doc/current/performance.html -opcache.interned_strings_buffer = 16 -opcache.max_accelerated_files = 20000 -opcache.memory_consumption = 256 -realpath_cache_size = 4096K -realpath_cache_ttl = 600 - -post_max_size = 6M -upload_max_filesize = 5M diff --git a/.docker/start-chromium b/.docker/start-chromium new file mode 100644 index 00000000..8bd50f50 --- /dev/null +++ b/.docker/start-chromium @@ -0,0 +1,9 @@ +#!/bin/bash + +chromium \ + --headless\ + --no-sandbox\ + --disable-gpu\ + --remote-debugging-address=0.0.0.0\ + --remote-debugging-port=9222 + $1 \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9782db14..44b98782 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,7 +52,7 @@ jobs: uses: docker/login-action@v1.10.0 if: github.event_name != 'pull_request' with: - registry: registry.bitbag.shop + registry: registry.mollie.shop username: ${{ secrets.DOCKER_REPOSITORY_LOGIN }} password: ${{ secrets.DOCKER_REPOSITORY_PASSWORD }} logout: true diff --git a/.gitignore b/.gitignore index 939151c7..2f036e48 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,9 @@ /node_modules/ /composer.lock -/src/Resources/public/bitbag/manifest.json -/src/Resources/public/bitbag/mollie/admin.js.LICENSE.txt -/public/bitbag/entrypoints.json +/src/Resources/public/mollie/manifest.json +/src/Resources/public/mollie/mollie/admin.js.LICENSE.txt +/public/mollie/entrypoints.json /etc/build/* !/etc/build/.gitkeep diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 4508a95c..00000000 --- a/Dockerfile +++ /dev/null @@ -1,192 +0,0 @@ -ARG PHP_VERSION=8.0 -ARG NODE_VERSION=12.13 -ARG NGINX_VERSION=1.16 - -########################## WKHTMLTOPDF ########################## -FROM madnight/docker-alpine-wkhtmltopdf as wkhtmltopdf_image - -########################## PHP ########################## -FROM bitbag/sylius-php:${PHP_VERSION}-alpine AS root_php - -ENV COMPOSER_ALLOW_SUPERUSER=1 - -COPY --from=composer /usr/bin/composer /usr/bin/composer - -########################## PACKAGES FOR WKHTMLTOPDF ########################## -RUN apk add --no-cache \ - libstdc++ \ - libx11 \ - libxrender \ - libxext \ - ca-certificates \ - fontconfig \ - freetype \ - ttf-dejavu \ - ttf-droid \ - ttf-freefont \ - ttf-liberation \ - ; - -COPY --from=wkhtmltopdf_image /bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf - -WORKDIR /var/www - -ARG APP_ENV=prod - -# copy only specifically what we need - -COPY src src/ -COPY tests/Application/Kernel.php tests/Application/Kernel.php -COPY composer.json ./ - -RUN set -eux; \ - composer install; \ - composer dump-autoload; - -WORKDIR /var/www/tests/Application - -COPY tests/Application/assets assets/ -COPY tests/Application/bin bin/ -COPY tests/Application/config config/ -COPY tests/Application/public public/ -COPY tests/Application/src src/ -COPY tests/Application/templates templates/ -COPY tests/Application/translations translations/ -COPY tests/Application/.env ./.env -COPY tests/Application/.env.test ./.env.test -COPY tests/Application/composer.json ./ - -COPY .docker/php/php.ini /usr/local/etc/php/php.ini -COPY .docker/php/php-cli.ini /usr/local/etc/php/php-cli.ini - -RUN set -eux; \ - composer install; \ - composer dump-autoload; \ - mkdir -p var/cache var/log; \ - chmod +x bin/console; sync; - -RUN set -eux; \ - php bin/console assets:install; \ - php bin/console sylius:install:assets; - -VOLUME /var/www/tests/Application/var -VOLUME /var/www/tests/Application/public/media - -COPY .docker/php/docker-entrypoint.sh /usr/local/bin/docker-entrypoint -RUN chmod +x /usr/local/bin/docker-entrypoint - -ENTRYPOINT ["docker-entrypoint"] -CMD ["php-fpm"] - -########################## NODE ########################## -FROM node:${NODE_VERSION}-alpine AS nodejs - -RUN set -eux; \ - apk add --no-cache --virtual .build-deps \ - g++ \ - gcc \ - git \ - make \ - python \ - ; - -WORKDIR /var/www - -COPY --from=root_php /var/www/vendor ./vendor -COPY package.json webpack.config.js yarn.lock ./ -COPY src/Resources/public ./src/Resources/public -COPY src/Resources/assets ./src/Resources/assets - -WORKDIR /var/www/tests/Application - -# prevent the reinstallation of vendors at every changes in the source code - -COPY tests/Application/package.json tests/Application/webpack.config.js tests/Application/yarn.lock tests/Application/.babelrc ./ -COPY tests/Application/assets ./assets -COPY tests/Application/gulpfile.babel.js ./ -COPY --from=root_php /var/www/tests/Application/public/bundles ./public/bundles -COPY --from=root_php /var/www/tests/Application/vendor ./vendor - -RUN set -eux; \ - yarn install; \ - yarn cache clean - -RUN ln -sf /var/www/tests/Application/node_modules /var/www - -RUN yarn run gulp -RUN yarn encore production - -COPY .docker/nodejs/docker-entrypoint.sh /usr/local/bin/docker-entrypoint -RUN chmod +x /usr/local/bin/docker-entrypoint - -ENTRYPOINT ["docker-entrypoint"] -CMD ["yarn", "watch"] - - -########################## NGINX ########################## -FROM nginx:${NGINX_VERSION}-alpine AS nginx - -COPY .docker/nginx/conf.d/default.conf /etc/nginx/conf.d/ - -WORKDIR /var/www - -COPY --from=root_php /var/www/tests/Application/public public/ -COPY --from=nodejs /var/www/tests/Application/public public/ - -########################## PHP ########################## -FROM bitbag/sylius-php:${PHP_VERSION}-alpine AS result_php - -RUN apk add --no-cache fcgi; - -########################## PACKAGES FOR WKHTMLTOPDF ########################## -RUN apk add --no-cache \ - libstdc++ \ - libx11 \ - libxrender \ - libxext \ - ca-certificates \ - fontconfig \ - freetype \ - ttf-dejavu \ - ttf-droid \ - ttf-freefont \ - ttf-liberation \ - ; - -COPY --from=wkhtmltopdf_image /bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf - -COPY .docker/php/docker-entrypoint.sh /usr/local/bin/docker-entrypoint -COPY .docker/php/docker-healthcheck.sh /usr/local/bin/docker-healthcheck - -RUN chmod +x /usr/local/bin/docker-entrypoint -RUN chmod +x /usr/local/bin/docker-healthcheck - -RUN { \ - echo '[www]'; \ - echo 'ping.path = /ping'; \ - } | tee /usr/local/etc/php-fpm.d/docker-healthcheck.conf - -WORKDIR /var/www - -COPY --from=root_php /var/www/src src/ -COPY --from=root_php /var/www/vendor vendor/ -COPY --from=root_php /var/www/tests/Application/bin tests/Application/bin/ -COPY --from=root_php /var/www/tests/Application/config tests/Application/config/ -COPY --from=root_php /var/www/tests/Application/src tests/Application/src/ -COPY --from=root_php /var/www/tests/Application/public tests/Application/public/ -COPY --from=root_php /var/www/tests/Application/templates tests/Application/templates/ -COPY --from=root_php /var/www/tests/Application/translations tests/Application/translations/ -COPY --from=root_php /var/www/tests/Application/Kernel.php tests/Application/Kernel.php -COPY --from=root_php /var/www/tests/Application/composer.json tests/Application/composer.json -COPY --from=root_php /var/www/tests/Application/composer.lock tests/Application/composer.lock -COPY --from=nodejs /var/www/tests/Application/public tests/Application/public/ - -COPY --from=root_php /usr/local/etc/php/php.ini /usr/local/etc/php/php.ini -COPY --from=root_php /usr/local/etc/php/php-cli.ini /usr/local/etc/php/php-cli.ini - -RUN touch tests/Application/.env - -WORKDIR /var/www/tests/Application - -ENTRYPOINT ["docker-entrypoint"] -CMD ["php-fpm"] diff --git a/README.md b/README.md index 579a6b01..cfd3f2db 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ # Mollie Payments Plugin for Sylius ---- -[![](https://img.shields.io/packagist/l/bitbag/mollie-plugin.svg) ](https://packagist.org/packages/bitbag/mollie-plugin "License") [ ![](https://img.shields.io/packagist/v/bitbag/mollie-plugin.svg) ](https://packagist.org/packages/bitbag/mollie-plugin "Version") [ ![](https://img.shields.io/scrutinizer/g/BitBagCommerce/SyliusMolliePlugin.svg) ](https://scrutinizer-ci.com/g/BitBagCommerce/SyliusMolliePlugin/ "Scrutinizer") [![](https://poser.pugx.org/bitbag/mollie-plugin/downloads)](https://packagist.org/packages/bitbag/mollie-plugin "Total Downloads") [![Slack](https://img.shields.io/badge/community%20chat-slack-FF1493.svg)](http://sylius-devs.slack.com) [![Support](https://img.shields.io/badge/support-contact%20author-blue])](https://www.mollie.com/en/contact/) - ## Table of Content *** @@ -68,14 +66,14 @@ This **open-source plugin was developed to help the Sylius community** and make We work on stable, supported and up-to-date versions of packages. We recommend you to do the same. -| Package | Version | -| --- | --- | -| PHP | ^7.2 | -| ext-json: * | | -| mollie/mollie-api-php | ^2.0 | -| sylius/admin-order-creation-plugin | ^0.9.0 | -| sylius/refund-plugin | ^1.0.0-RC.3 | -| sylius/sylius | ^1.7.0 | +| Package | Version | +|------------------------------------|-----------------------------------------------| +| PHP | ^7.2 \|\| ^8.0 | +| ext-json: * | | +| mollie/mollie-api-php | ^2.0 | +| sylius/admin-order-creation-plugin | ^0.12 \|\| ^0.13 \|\| v0.14 | +| sylius/refund-plugin | ^1.0 | +| sylius/sylius | ~1.9.0 \|\| ~1.10.0 \|\| ~1.11.0 \|\| ~1.12.0 | ---- @@ -88,7 +86,7 @@ During configuration first, save the keys to the database and then click "Load m ### Rendering Mollie credit card form -You can use `BitBagSyliusMolliePlugin:DirectDebit:_form.html.twig` and `@BitBagSyliusMolliePlugin/Grid/Action/cancelSubscriptionMollie.html.twig` templates for adding the form to supplementing the direct debit card data from and cancel the subscription form the Twig UI. +You can use `SyliusMolliePlugin:DirectDebit:_form.html.twig` and `@SyliusMolliePlugin/Grid/Action/cancelSubscriptionMollie.html.twig` templates for adding the form to supplementing the direct debit card data from and cancel the subscription form the Twig UI. For an example on how to do that, take a look at [these source files](tests/Application/templates/bundles/SyliusShopBundle). @@ -99,7 +97,7 @@ For an example on how to do that, take a look at [these source files](tests/Appl Run the below command to see what Symfony services are shared with this plugin: ``` -$ bin/console debug:container bitbag_sylius_mollie_plugin +$ bin/console debug:container sylius_mollie_plugin ``` ## Plugin Development @@ -208,5 +206,3 @@ This plugin's source code is completely free and released under the terms of the ## Contact --- If you want to contact us, the best way is to fill the form on [our website](https://www.mollie.com/en/contact/merchants) or send us an e-mail to support@mollie.com with your question(s). We guarantee that we answer as soon as we can! - -Plugin was originally developed by BitBag diff --git a/behat.yml b/behat.yml index 88d5ceae..932301ed 100644 --- a/behat.yml +++ b/behat.yml @@ -13,20 +13,21 @@ default: Behat\MinkExtension: files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/" - base_url: "https://127.0.0.1:8080/" + base_url: "http://172.17.0.1/" default_session: symfony - javascript_session: chrome_headless + javascript_session: chrome sessions: symfony: symfony: ~ chrome_headless: chrome: socket_timeout: 60 - api_url: http://127.0.0.1:9222 + api_url: http://172.17.0.1:9222 validate_certificate: false chrome: selenium2: browser: chrome + wd_host: http://172.17.0.1:4444/wd/hub capabilities: browserName: chrome browser: chrome @@ -47,7 +48,7 @@ default: FriendsOfBehat\SymfonyExtension: bootstrap: tests/Application/config/bootstrap.php kernel: - class: Tests\BitBag\SyliusMolliePlugin\Application\Kernel + class: Tests\SyliusMolliePlugin\Application\Kernel FriendsOfBehat\VariadicExtension: ~ diff --git a/behat.yml.dist b/behat.yml.dist index 419eb81d..aca7068b 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -38,7 +38,7 @@ default: FriendsOfBehat\SymfonyExtension: bootstrap: tests/Application/config/bootstrap.php kernel: - class: Tests\BitBag\SyliusMolliePlugin\Application\Kernel + class: Tests\SyliusMolliePlugin\Application\Kernel FriendsOfBehat\VariadicExtension: ~ diff --git a/composer.json b/composer.json index 37c479ef..c619dad2 100644 --- a/composer.json +++ b/composer.json @@ -1,17 +1,17 @@ { - "name": "bitbag/mollie-plugin", + "name": "mollie/sylius-plugin", "type": "sylius-plugin", "description": "Mollie payment plugin for Sylius applications.", "license": "MIT", "require": { - "php": "^8.0", - "sylius/sylius": "~1.10.0 || ~1.11.0", - "symfony/messenger": "^4.4 || ^5.2", + "php": "^7.4 || ^8.0", + "sylius/sylius": "~1.9.0 || ~1.10.0 || ~1.11.0 || ~1.12.0", + "symfony/messenger": "^4.4 || ^5.2 || ^6.0", "mollie/mollie-api-php": "^2.0", - "sylius/refund-plugin": "^1.1", - "sylius/admin-order-creation-plugin": "^0.13", + "sylius/refund-plugin": "^1.0", + "sylius/admin-order-creation-plugin": "^0.12 || ^0.13 || v0.14", "ext-json": "*", - "willdurand/js-translation-bundle": "^4.0" + "willdurand/js-translation-bundle": "^4.0 || ^5.0" }, "require-dev": { "behat/behat": "^3.6.1", @@ -28,6 +28,11 @@ "friends-of-behat/variadic-extension": "^1.3", "friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev", "phpspec/phpspec": "^7.0", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "0.12.85", + "phpstan/phpstan-doctrine": "0.12.33", + "phpstan/phpstan-strict-rules": "^0.12.0", + "phpstan/phpstan-webmozart-assert": "0.12.12", "phpunit/phpunit": "^9.5", "sensiolabs/security-checker": "^6.0", "symfony/browser-kit": "^4.4 || ^5.2", @@ -37,7 +42,7 @@ "symfony/web-profiler-bundle": "^4.4 || ^5.2", "vimeo/psalm": "4.7.1", "symfony/webpack-encore-bundle": "^1.12", - "bitbag/coding-standard": "^1.0", + "sylius-labs/coding-standard": "^4.0", "lchrusciel/api-test-case": "^5.2", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, @@ -57,8 +62,8 @@ "prefer-stable": true, "autoload": { "psr-4": { - "BitBag\\SyliusMolliePlugin\\": "src/", - "Tests\\BitBag\\SyliusMolliePlugin\\": ["tests/", "tests/Application/src"] + "SyliusMolliePlugin\\": "src/", + "Tests\\SyliusMolliePlugin\\": ["tests/", "tests/Application/src"] } }, "autoload-dev": { diff --git a/doc/BitBagSyliusMolliePlugin.png b/doc/SyliusMolliePlugin.png similarity index 100% rename from doc/BitBagSyliusMolliePlugin.png rename to doc/SyliusMolliePlugin.png diff --git a/doc/installation.md b/doc/installation.md index fceb9c7e..d0ae3353 100644 --- a/doc/installation.md +++ b/doc/installation.md @@ -1,54 +1,21 @@ -## Installation +# Installation -The Refund plugin does not yet have stable release. -You can install first Refund plugin by adding this line to composer.json - -```diff - "require": { - "sylius/refund-plugin": "1.0.0-RC9 as 1.0.0", - }, - ... -``` -Or configure project to accept releases candidate version +#### 1. Require refund plugin with composer: ```bash -composer config minimum-stability rc -composer config prefer-stable true +composer require sylius/refund-plugin ``` -1.Require with composer +Ensure that you have `wkhtmltopdf` installed, and that you have the proper path to it set in the .env file (`WKHTMLTOPDF_PATH` and `WKHTMLTOIMAGE_PATH` variables). + +#### 2. Require Mollie plugin with composer: ```bash -composer require bitbag/mollie-plugin --no-scripts +composer require mollie/sylius-plugin --no-scripts -w ``` -2.Add traits to your GatewayConfig entity class, when You don't use annotation. -```php -mollieGatewayConfig = new ArrayCollection(); - } -} -``` - -Or this way if you use annotations: ```php mollieGatewayConfig = new ArrayCollection(); } } -```` -You can find an example under the [tests/Application/src/Entity/*](/tests/Application/src/Entity/) path. +``` + +You can find more annotation examples under the [tests/Application/src/Entity/*](/tests/Application/src/Entity/) path. -If you don't use annotations, define new Entity mapping inside your `src/Resources/config/doctrine` directory. +If you don't use annotations, you can also define new Entity mapping inside your `src/Resources/config/doctrine` directory: ```xml @@ -101,7 +69,7 @@ If you don't use annotations, define new Entity mapping inside your `src/Resourc http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" > - + @@ -112,7 +80,6 @@ If you don't use annotations, define new Entity mapping inside your `src/Resourc For an example, check [tests/Application/src/Resources/config/doctrine/GatewayConfig.orm.xml](/tests/Application/src/Resources/config/doctrine/GatewayConfig.orm.xml) file. Override GatewayConfig resource: - ```yaml # config/packages/_sylius.yaml ... @@ -124,26 +91,7 @@ sylius_payum: model: App\Entity\Payment\GatewayConfig ``` -3.Add traits to your Order entity class, when You don't use annotation. - -```php -items + ->filter(function (OrderItemInterface $orderItem) { + $variant = $orderItem->getVariant(); + + return $variant !== null + && true === $variant->isRecurring(); + }) + ; + } + + public function getNonRecurringItems(): Collection + { + return $this + ->items + ->filter(function (OrderItemInterface $orderItem) { + $variant = $orderItem->getVariant(); + + return $variant !== null + && false === $variant->isRecurring(); + }) + ; + } -If you don't use annotations, define new Entity mapping inside your src/Resources/config/doctrine directory. + public function hasRecurringContents(): bool + { + return 0 < $this->getRecurringItems()->count(); + } + public function hasNonRecurringContents(): bool + { + return 0 < $this->getNonRecurringItems()->count(); + } +} +``` + +If you don't use annotations, you can also define new Entity mapping inside your `src/Resources/config/doctrine` directory. ```xml @@ -189,7 +187,6 @@ If you don't use annotations, define new Entity mapping inside your src/Resource - ``` Override Order resource: @@ -204,26 +201,7 @@ sylius_order: model: App\Entity\Order\Order ``` -4.Add traits to your Product entity class, when You don't use annotation. - -```php - @@ -267,7 +244,7 @@ If you don't use annotations, define new Entity mapping inside your src/Resource ``` -Override Order resource: +Override Product resource: ```yaml # config/packages/_sylius.yaml @@ -290,55 +267,195 @@ sylius_product: model: App\Entity\Product\Product ``` +#### 6. Update the ProductVariant entity class with the following code: -5.Add plugin dependencies to your `config/bundles.php` file: +```php +getProduct()->getName(); + } +} +``` +Add RecurringProductVariantTrait implementation: ```php +recurring; + } + + public function setRecurring(bool $recurring): void + { + $this->recurring = $recurring; + } + + public function getTimes(): ?int + { + return $this->times; + } + + public function setTimes(?int $times): void + { + $this->times = $times; + } + + public function getInterval(): ?string + { + return $this->interval; + } + + public function setInterval(?string $interval): void + { + $this->interval = $interval; + } +} +``` + +If you don't use annotations, you can also define new Entity mapping inside your `src/Resources/config/doctrine` directory. + +```xml + + + + + + + + + + + + + +``` +Override ProductVariant resource: + +```yaml +# config/packages/_sylius.yaml +... + +sylius_product: + resources: + product_variant: + classes: + model: App\Entity\Product\ProductVariant +``` + +#### 7. Ensure that the plugin dependency is added to your `config/bundles.php` file: + +```php +# config/bundles.php + return [ ... - BitBag\SyliusMolliePlugin\BitBagSyliusMolliePlugin::class => ['all' => true], + SyliusMolliePlugin\SyliusMolliePlugin::class => ['all' => true], ]; ``` -6.Import required config in your `config/packages/_sylius.yaml` file: +#### 8. Import required config in your `config/packages/_sylius.yaml` file: ```yaml # config/packages/_sylius.yaml imports: ... - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/config.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/config.yaml" } ``` -7.Import the routing in your `config/routes.yaml` file: - +#### 9. Add state machine configuration in `config/packages/_sylius.yaml`: ```yaml -# config/routes.yaml +# config/packages/_sylius.yaml -bitbag_sylius_mollie_plugin: - resource: "@BitBagSyliusMolliePlugin/Resources/config/routing.yaml" - -_bazinga_jstranslation: - resource: "@BazingaJsTranslationBundle/Resources/config/routing/routing.yml" +winzou_state_machine: + sylius_order_checkout: + transitions: + complete: + from: [cart, addressed, shipping_selected, shipping_skipped, payment_selected, payment_skipped] + to: completed ``` -8.Add image dir parameter in `config/pacakges/_sylius.yaml` +#### 10. Add image directory parameter in `config/packages/_sylius.yaml`: ```yaml -# config/pacakges/_sylius.yaml +# config/packages/_sylius.yaml parameters: images_dir: "/media/image/" -``` +``` + +#### 11. Import the routing in your `config/routes.yaml` file: + +```yaml +# config/routes.yaml + +sylius_mollie_plugin: + resource: "@SyliusMolliePlugin/Resources/config/routing.yaml" +``` -9.Update your database +#### 12. Update your database -Apply migration to your database +Apply migration to your database: ``` bin/console doctrine:migrations:migrate ``` -10.Copy Sylius templates overridden in plugin to your templates directory (e.g templates/bundles/): +#### 13. Copy Sylius templates overridden in plugin to your templates directory (e.g templates/bundles/): ``` mkdir -p templates/bundles/SyliusAdminBundle/ @@ -346,120 +463,139 @@ mkdir -p templates/bundles/SyliusShopBundle/ mkdir -p templates/bundles/SyliusUiBundle/ mkdir -p templates/bundles/SyliusRefundPlugin/ -cp -R vendor/bitbag/mollie-plugin/tests/Application/templates/bundles/SyliusAdminBundle/* templates/bundles/SyliusAdminBundle/ -cp -R vendor/bitbag/mollie-plugin/tests/Application/templates/bundles/SyliusShopBundle/* templates/bundles/SyliusShopBundle/ -cp -R vendor/bitbag/mollie-plugin/tests/Application/templates/bundles/SyliusUiBundle/* templates/bundles/SyliusUiBundle/ -cp -R vendor/bitbag/mollie-plugin/tests/Application/templates/bundles/SyliusRefundPlugin/* templates/bundles/SyliusRefundPlugin/ +cp -R vendor/mollie/sylius-plugin/tests/Application/templates/bundles/SyliusAdminBundle/* templates/bundles/SyliusAdminBundle/ +cp -R vendor/mollie/sylius-plugin/tests/Application/templates/bundles/SyliusShopBundle/* templates/bundles/SyliusShopBundle/ +cp -R vendor/mollie/sylius-plugin/tests/Application/templates/bundles/SyliusUiBundle/* templates/bundles/SyliusUiBundle/ +cp -R vendor/mollie/sylius-plugin/tests/Application/templates/bundles/SyliusRefundPlugin/* templates/bundles/SyliusRefundPlugin/ ``` -11.Install assets +#### 14. Install assets: -``` +```bash bin/console assets:install ``` **Note:** If you are running it on production, add the `-e prod` flag to this command. - -12.On abandoned payment link to run it on CLI we need to add a script e.g cron. Example here: +#### 15. Add the payment link cronjob: ```shell script -* * * * * /var/www/mollie/scripts/payment-link.sh - -/usr/bin/php /var/www/mollie/bin/console mollie:send-payment-link +* * * * * /usr/bin/php /path/to/bin/console mollie:send-payment-link ``` -13. Add state machine configuration in `_sylius.yaml` -```yaml -# config/packages/_sylius.yaml +#### 16. Download the [domain validation file](https://www.mollie.com/.well-known/apple-developer-merchantid-domain-association) and place it on your server at: +`public/.well-known/apple-developer-merchantid-domain-association` -winzou_state_machine: - sylius_order_checkout: - transitions: - complete: - from: [cart, addressed, shipping_selected, shipping_skipped, payment_selected, payment_skipped] - to: completed -``` +### Frontend -14. Download the [domain validation file](https://www.mollie.com/.well-known/apple-developer-merchantid-domain-association) and place it on your server at -`public/.well-known/apple-developer-merchantid-domain-association` +#### 1. Installing assets without `webpack` -15.Frontend
+If you're not using `webpack`, you can install assets via: -
15.1 -If your not using webpack, you can install assets via -``` -$ bin/console assets:install +```bash +bin/console assets:install ``` -And then import these already builded assets into shop/admin _script and _styles .html.twig -For example:`templates/bundles/SyliusAdminBundle/_scripts.html.twig ` using : +And then import these already built assets into shop/admin `_scripts` and `_styles` .html.twig files: +For example:`templates/bundles/SyliusAdminBundle/_scripts.html.twig ` using: ``` -{{ asset('public/bundles/bitbagsyliusmollieplugin/bitbag/mollie/admin.css') }} -{{ asset('public/bundles/bitbagsyliusmollieplugin/bitbag/mollie/admin.js') }} -{{ asset('public/bundles/bitbagsyliusmollieplugin/bitbag/mollie/shop.css') }} -{{ asset('public/bundles/bitbagsyliusmollieplugin/bitbag/mollie/shop.js') }} +{{ asset('public/bundles/syliusmollieplugin/mollie/admin.css') }} +{{ asset('public/bundles/syliusmollieplugin/mollie/admin.js') }} +{{ asset('public/bundles/syliusmollieplugin/mollie/shop.css') }} +{{ asset('public/bundles/syliusmollieplugin/mollie/shop.js') }} ``` These assets are located in: ``` -public/bundles/bitbagsyliusmollieplugin/bitbag/mollie/admin.css -public/bundles/bitbagsyliusmollieplugin/bitbag/mollie/admin.js -public/bundles/bitbagsyliusmollieplugin/bitbag/mollie/shop.css -public/bundles/bitbagsyliusmollieplugin/bitbag/mollie/shop.js +public/bundles/syliusmollieplugin/mollie/admin.css +public/bundles/syliusmollieplugin/mollie/admin.js +public/bundles/syliusmollieplugin/mollie/shop.css +public/bundles/syliusmollieplugin/mollie/shop.js ``` -
15.2 -Another way is to import already builded assets directly from mollie source files: +#### 2. Importing pre-built assets without `webpack` + +Another way is to import already built assets directly from mollie source files: ``` -vendor/bitbag/mollie-plugin/src/Resources/public/bitbag/mollie/admin.css -vendor/bitbag/mollie-plugin/src/Resources/public/bitbag/mollie/admin.js -vendor/bitbag/mollie-plugin/src/Resources/public/bitbag/mollie/shop.css -vendor/bitbag/mollie-plugin/src/Resources/public/bitbag/mollie/shop.js +vendor/mollie/sylius-plugin/src/Resources/public/mollie/admin.css +vendor/mollie/sylius-plugin/src/Resources/public/mollie/admin.js +vendor/mollie/sylius-plugin/src/Resources/public/mollie/shop.css +vendor/mollie/sylius-plugin/src/Resources/public/mollie/shop.js ``` -
15.3 -Another way is: -If you are using the webpack in your own project, you can add entries to your own (root) webpack configuration which will build the mollie resources in the directory of your choice, the pre builded mollie assets are located in: +#### 3. Using `webpack` + +Require webpack bundle with composer: + +```bash +composer require symfony/webpack-encore-bundle ``` -"vendor/bitbag/mollie-plugin/src/Resources/assets/admin/entry.js" //admin scss and js files are imported into entry.js file -"vendor/bitbag/mollie-plugin/src/Resources/assets/shop/entry.js" //shop scss and js files are imported into entry.js file + +Ensure the following configuration is present in `config/packages/webpack_encore.yaml`: + ``` +webpack_encore: + output_path: "%kernel.project_dir%/public/build" + builds: + mollie-admin: "%kernel.project_dir%/public/build/admin" + mollie-shop: "%kernel.project_dir%/public/build/shop" + script_attributes: + defer: false -And then in your root webpack.config add Entries: +framework: + assets: + json_manifest_path: '%kernel.project_dir%/public/build/admin/manifest.json' ``` - .addEntry( - "mollie-admin-entry", + +Ensure that `mollie-shop-entry` and `mollie-admin-entry` are present in `webpackconfig.js`: + +```js +Encore.addEntry( + 'mollie-shop-entry', path.resolve( __dirname, - "vendor/bitbag/mollie-plugin/src/Resources/assets/admin/entry.js" + 'vendor/mollie/sylius-plugin/src/Resources/assets/shop/entry.js' ) - ) - - .addEntry( - "mollie-shop-entry", +) + +Encore.addEntry( + 'mollie-admin-entry', path.resolve( - __dirname, - "vendor/bitbag/mollie-plugin/src/Resources/assets/shop/entry.js" + __dirname, + 'vendor/mollie/sylius-plugin/src/Resources/assets/admin/entry.js' ) - ) +) ``` -Add your new mollie builds into your `webpack_encore.yaml`: +If you are using Sylius version <= 1.11 ensure that Node version 12 is currently used, otherwise Node version 14 should be used: + +```bash +nvm install 12 +nvm use 12 ``` -builds: - mollie-admin: '%kernel.project_dir%/public/build/admin' - mollie-shop: '%kernel.project_dir%/public/build/shop' + +Ensure you have the following packages installed: + +```bash +yarn add babel-preset-env bazinga-translator intl-messageformat lodash.get node-sass@4.14.1 shepherd.js@11.0 webpack-notifier +yarn add --dev @babel/core@7.16.0 @babel/register@7.16.0 @babel/plugin-proposal-object-rest-spread@7.16.5 @symfony/webpack-encore@1.5.0 ``` +Run gulp: -And then you can import css/js files inside your admin and shop _scripts.html.twig and _styles.html.twig -For example in :`templates/bundles/SyliusAdminBundle/_scripts.html.twig `using: +```bash +yarn run gulp ``` -{{ encore_entry_script_tags('mollie-shop-entry', null, 'mollie-shop') }} // these are shop mollie assets (js) -{{ encore_entry_link_tags('mollie-shop-entry', null, 'mollie-shop') }} // these are shop mollie assets (css) +Build the front-end assets: -{{ encore_entry_script_tags('mollie-admin-entry', null, 'mollie-admin') }} // these are admin mollie assets (js) +```bash +yarn install +yarn build +yarn encore production +``` + +Update the scheme, since webpack and asset require new tables that are not in the migrations: -{{ encore_entry_link_tags('mollie-admin-entry', null, 'mollie-admin') }} // these are admin mollie assets (css) +```bash +php bin/console doctrine:schema:update --force ``` diff --git a/doc/recurring.md b/doc/recurring.md index 7e9344a5..4ace1c5d 100644 --- a/doc/recurring.md +++ b/doc/recurring.md @@ -26,7 +26,7 @@ In order to configure one's, access any product's variants, and modify it's **Re ![subscription_admin_variant.png](subscription_admin_variant.png) -And then, edit it's settings up to your needs +And then, edit its settings up to your needs ![subscription_admin_variant_settings.png](subscription_admin_variant_settings.png) @@ -63,12 +63,12 @@ By default, this plugin comes with labels, that indicate **subscription** state However, they may not fit into your template(s). In order to replace them, override of few templates is necesary: Copy: -* `vendor/bitbag/mollie-plugin/src/Resources/views/Shop/_partial/_recurringBadge.html.twig` into `templates/SyliusMolliePlugin/Shop/_partial/_recurringBadge.html.twig` +* `vendor/mollie/sylius-plugin/src/Resources/views/Shop/_partial/_recurringBadge.html.twig` into `templates/SyliusMolliePlugin/Shop/_partial/_recurringBadge.html.twig` Check: -* `vendor/bitbag/mollie-plugin/src/Resources/views/Shop/_partial/_recurringTranslations.html.twig` -* `vendor/bitbag/mollie-plugin/src/Resources/views/Shop/Product` -* `vendor/bitbag/mollie-plugin/src/Resources/views/Shop/Cart` +* `vendor/mollie/sylius-plugin/src/Resources/views/Shop/_partial/_recurringTranslations.html.twig` +* `vendor/mollie/sylius-plugin/src/Resources/views/Shop/Product` +* `vendor/mollie/sylius-plugin/src/Resources/views/Shop/Cart` for more templates to customize. diff --git a/docker-compose.yml b/docker-compose.yml index 9293e0b8..9fe88686 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,59 +1,55 @@ -version: '3.4' +version: '3.9' services: - php: + browser: + container_name: browser + ports: + - "9222:9222" build: - context: . - target: root_php - depends_on: - - mysql - environment: - - APP_ENV=dev - - APP_DEBUG=1 - - APP_SECRET=EDITME - - DATABASE_URL=mysql://sylius:nopassword@mysql/sylius - - PHP_DATE_TIMEZONE=${PHP_DATE_TIMEZONE:-UTC} - volumes: - - .:/var/www:rw - - ./tests/Application/public/media:/var/www/tests/Application/public/media:rw + context: .docker/ + dockerfile: Dockerfile.chromium + command: "http://127.0.0.1" - mysql: - image: percona:5.7 - environment: - - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-nopassword} - - MYSQL_DATABASE=sylius - - MYSQL_USER=sylius - - MYSQL_PASSWORD=${MYSQL_PASSWORD:-nopassword} - volumes: - - mysql-data:/var/lib/mysql:rw -# - ./docker/mysql/data:/var/lib/mysql:rw,delegated + hub: + container_name: selenium-hub + image: selenium/hub:3.11.0 ports: - - "3306:3306" + - "4444:4444" + links: + - app - nodejs: - build: - context: . - target: nodejs - environment: - PHP_HOST: php - PHP_PORT: 9000 + chrome: + container_name: selenium-chrome + image: selenium/node-chrome-debug:3.11.0 depends_on: - - php - volumes: - - .:/var/www:rw - - nginx: + - hub + links: + - app + environment: + - HUB_HOST=hub + - HUB_PORT=4444 + ports: + - "5900:5900" + app: build: - context: . - target: nginx - depends_on: - - php - - nodejs # to ensure correct build order - volumes: - - ./tests/Application/public:/var/www/tests/Application/public:ro + context: .docker/ + container_name: sylius-mollie5-dev + tty: true ports: - "80:80" + - "8080:8080" + - "443:443" + - "2222:22" + volumes: + - "mollie_db_volume:/var/lib/mysql" + - ./.:/var/www/html/public:rw + - ./tests/Application/public/media:/var/www/html/public/tests/Application/public/media:rw + environment: + - XDEBUG_ENABLED=1 + - XDEBUG_REMOTE_HOST=172.17.0.1 + - PHP_VERSION=8.0 + - NODE_VERSION=14 volumes: - mysql-data: - public-media: + mollie_db_volume: + name: mollie_db_volume \ No newline at end of file diff --git a/ecs.php b/ecs.php index e977b81d..367a613a 100644 --- a/ecs.php +++ b/ecs.php @@ -1,23 +1,29 @@ import('vendor/bitbag/coding-standard/ecs.php'); +use PhpCsFixer\Fixer\Import\NoUnusedImportsFixer; +use Symplify\EasyCodingStandard\Config\ECSConfig; - $parameters = $containerConfigurator->parameters(); - $parameters->set(Option::PATHS, [ +return function (ECSConfig $ecsConfig): void { + $ecsConfig->paths([ __DIR__ . '/src', __DIR__ . '/tests', ]); + + // this way you add a single rule + $ecsConfig->rules([ + NoUnusedImportsFixer::class, + ]); + + // this way you can add sets - group of rules + $ecsConfig->sets([ + // run and fix, one by one + // SetList::SPACES, + // SetList::ARRAY, + // SetList::DOCBLOCK, + // SetList::NAMESPACES, + // SetList::COMMENTS, + // SetList::PSR_12, + ]); }; diff --git a/features/shop/paying_with_mollie_during_checkout.feature b/features/shop/paying_with_mollie_during_checkout.feature index f445599c..95b99962 100644 --- a/features/shop/paying_with_mollie_during_checkout.feature +++ b/features/shop/paying_with_mollie_during_checkout.feature @@ -6,11 +6,11 @@ Feature: Paying with Mollie during checkout Background: Given the store operates on a single channel in "United States" - And there is a user "john@bitbag.pl" identified by "password123" + And there is a user "john@mollie.pl" identified by "password123" And the store has a payment method "Mollie" with a code "mollie" and Mollie payment gateway And gateway "mollie" has all methods loaded and enabled And the store ships everywhere for free - And I am logged in as "john@bitbag.pl" + And I am logged in as "john@mollie.pl" And I am logged in as an administrator @ui @@ -23,7 +23,7 @@ Feature: Paying with Mollie during checkout When I confirm my order Then I should be notified that my payment has been completed When I browse orders - Then I should see a single order from customer "john@bitbag.pl" + Then I should see a single order from customer "john@mollie.pl" And I view summary of last order And it should be paid with "Mollie" diff --git a/features/shop/paying_with_mollie_subscription_during_checkout.feature b/features/shop/paying_with_mollie_subscription_during_checkout.feature index cb2dd30c..3962365c 100644 --- a/features/shop/paying_with_mollie_subscription_during_checkout.feature +++ b/features/shop/paying_with_mollie_subscription_during_checkout.feature @@ -6,13 +6,13 @@ Feature: Paying with Mollie Subscription during checkout Background: Given the store operates on a single channel in "United States" - And there is a user "john@bitbag.pl" identified by "password123" + And there is a user "john@mollie.pl" identified by "password123" And the store has a payment method "Mollie Subscription" with a code "mollie_subscription" and Mollie Subscription payment gateway And gateway "mollie_subscription" has all methods loaded and enabled And the store has a product "PHP T-Shirt" priced at "€19.99" And the "PHP T-shirt" variant has recurring payment enabled And the store ships everywhere for free - And I am logged in as "john@bitbag.pl" + And I am logged in as "john@mollie.pl" @ui Scenario: Successful payment diff --git a/package.json b/package.json index fac2b671..e2218043 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,15 @@ { - "name": "@bitbag/mollie-plugin", + "name": "@mollie/sylius-plugin", "version": "1.1.0", "description": "Sylius Mollie Plugin", - "repository": "git@github.com:BitBagCommerce/SyliusMolliePlugin.git", - "author": "BitBag ", + "repository": "git@github.com:sebastian-mollie/SyliusMolliePlugin.git", + "author": { + "name": "Mollie B.V." + }, "license": "MIT", "private": false, "scripts": { - "prod": "yarn encore production -o src/Resources/public/bitbag/" + "prod": "yarn encore production -o src/Resources/public/mollie/" }, "dependencies": { "@symfony/webpack-encore": "^1.5.0", diff --git a/phpspec.yml.dist b/phpspec.yml.dist index d1251149..685100e6 100644 --- a/phpspec.yml.dist +++ b/phpspec.yml.dist @@ -1,4 +1,4 @@ suites: main: - namespace: BitBag\SyliusMolliePlugin - psr4_prefix: BitBag\SyliusMolliePlugin + namespace: SyliusMolliePlugin + psr4_prefix: SyliusMolliePlugin diff --git a/phpstan.neon b/phpstan.neon index f36ee915..440c1056 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -8,4 +8,5 @@ parameters: - 'src/DependencyInjection/Configuration.php' # Test dependencies - - 'tests/Application/*' + - 'tests/Application/app/**.php' + - 'tests/Application/src/**.php' diff --git a/phpunit.xml b/phpunit.xml index a144a9d5..c63ddd7b 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -13,7 +13,7 @@ - + diff --git a/spec/Action/Api/CancelRecurringSubscriptionActionSpec.php b/spec/Action/Api/CancelRecurringSubscriptionActionSpec.php index 5247bb80..6271826c 100644 --- a/spec/Action/Api/CancelRecurringSubscriptionActionSpec.php +++ b/spec/Action/Api/CancelRecurringSubscriptionActionSpec.php @@ -1,24 +1,17 @@ createToken( 'test', $identity, - 'bitbag_sylius_mollie_plugin_cancel_subscription_mollie', + 'sylius_mollie_plugin_cancel_subscription_mollie', ['orderId' => 'test_order_id'] )->willReturn($cancelToken); @@ -175,7 +168,7 @@ function it_executes_when_recurring_subscription_is_true( $genericTokenFactory->createToken( 'test', $identity, - 'bitbag_sylius_mollie_plugin_cancel_subscription_mollie', + 'sylius_mollie_plugin_cancel_subscription_mollie', ['orderId' => 'test_order_id'] )->willReturn($cancelToken); diff --git a/spec/Action/ConvertMolliePaymentActionSpec.php b/spec/Action/ConvertMolliePaymentActionSpec.php index 7be22fde..9d7fe987 100644 --- a/spec/Action/ConvertMolliePaymentActionSpec.php +++ b/spec/Action/ConvertMolliePaymentActionSpec.php @@ -1,33 +1,26 @@ trans('bitbag_sylius_mollie_plugin.order_checkout.colliding_products') + $translator->trans('sylius_mollie_plugin.order_checkout.colliding_products') ->willReturn($message); $flashBag->add('error', $message)->shouldBeCalledOnce(); diff --git a/spec/Factory/ApiCustomerFactorySpec.php b/spec/Factory/ApiCustomerFactorySpec.php index 48aacbb4..2aed1aa4 100644 --- a/spec/Factory/ApiCustomerFactorySpec.php +++ b/spec/Factory/ApiCustomerFactorySpec.php @@ -1,18 +1,13 @@ session = $session; $this->loggerAction = $loggerAction; $this->guzzleNegativeResponseParser = $guzzleNegativeResponseParser; } diff --git a/src/Action/Api/CreateOrderAction.php b/src/Action/Api/CreateOrderAction.php index 7cd4ece5..554de824 100644 --- a/src/Action/Api/CreateOrderAction.php +++ b/src/Action/Api/CreateOrderAction.php @@ -1,20 +1,14 @@ loggerAction = $loggerAction; $this->guzzleNegativeResponseParser = $guzzleNegativeResponseParser; - $this->session = $session; + $this->requestStack = $requestStack; } public function execute($request): void @@ -81,8 +75,8 @@ public function execute($request): void $details['statusError'] = $message; - $message = \sprintf('%s%s', 'bitbag_sylius_mollie_plugin.credit_cart_error.', $details['statusError']); - $this->session->getFlashBag()->add('info', $message); + $message = \sprintf('%s%s', 'sylius_mollie_plugin.credit_cart_error.', $details['statusError']); + $this->requestStack->getSession()->getFlashBag()->add('info', $message); return; } catch (\Exception $e) { diff --git a/src/Action/CaptureAction.php b/src/Action/CaptureAction.php index 02e03f91..bfa655d5 100644 --- a/src/Action/CaptureAction.php +++ b/src/Action/CaptureAction.php @@ -1,24 +1,18 @@ tokenFactory->createToken( $token->getGatewayName(), $token->getDetails(), - 'bitbag_sylius_mollie_plugin_cancel_subscription_mollie', + 'sylius_mollie_plugin_cancel_subscription_mollie', ['orderId' => $details['metadata']['order_id']] ); diff --git a/src/Action/CaptureActionInterface.php b/src/Action/CaptureActionInterface.php index ebc2301e..7556fe67 100644 --- a/src/Action/CaptureActionInterface.php +++ b/src/Action/CaptureActionInterface.php @@ -1,15 +1,9 @@ paymentDescription = $paymentDescription; - $this->session = $session; $this->mollieMethodsRepository = $mollieMethodsRepository; $this->orderConverter = $orderConverter; $this->customerContext = $customerContext; diff --git a/src/Action/ConvertMollieSubscriptionPaymentAction.php b/src/Action/ConvertMollieSubscriptionPaymentAction.php index 32846a7a..082fcd58 100644 --- a/src/Action/ConvertMollieSubscriptionPaymentAction.php +++ b/src/Action/ConvertMollieSubscriptionPaymentAction.php @@ -1,22 +1,16 @@ paymentDescription = $paymentDescription; - $this->session = $session; $this->mollieMethodsRepository = $mollieMethodsRepository; $this->orderConverter = $orderConverter; $this->customerContext = $customerContext; diff --git a/src/Action/NotifyAction.php b/src/Action/NotifyAction.php index e0d9af0b..99346cdc 100644 --- a/src/Action/NotifyAction.php +++ b/src/Action/NotifyAction.php @@ -1,22 +1,16 @@ method) { - $this->orderVoucherAdjustmentUpdater->update($payment, $order->metadata->order_id); - } - /** @var Payment $molliePayment */ $molliePayment = $this->mollieApiClient->payments->get($payment->id); $molliePayment->metadata = $order->metadata; + + if (MealVoucher::MEAL_VOUCHERS === $payment->method) { + $this->orderVoucherAdjustmentUpdater->update($molliePayment, $order->metadata->order_id); + } } catch (\Exception $e) { $this->loggerAction->addNegativeLog(sprintf('Error with get payment page with id %s', $details['payment_mollie_id'])); diff --git a/src/Action/StatusActionInterface.php b/src/Action/StatusActionInterface.php index a6e4a4b5..31d105e6 100644 --- a/src/Action/StatusActionInterface.php +++ b/src/Action/StatusActionInterface.php @@ -1,15 +1,9 @@ client->request('GET', $this->hubUri); - } catch (GuzzleException $exception) { - return null; - } - - $hubResponse = json_decode($hubResponse->getBody()->getContents(), true); - return $this->getMolliePluginLatestVersion($hubResponse); + return SyliusMolliePlugin::VERSION; +// try { +// $hubResponse = $this->client->request('GET', $this->hubUri); +// } catch (GuzzleException $exception) { +// return null; +// } +//checkLatestVersion +// $hubResponse = json_decode($hubResponse->getBody()->getContents(), true); +// +// return $this->getMolliePluginLatestVersion($hubResponse); } private function getMolliePluginLatestVersion(array $data): ?string { - $latestVersion = end($data['packages']['bitbag/mollie-plugin']); + $latestVersion = end($data['packages']['mollie/sylius-plugin']); if (isset($latestVersion['version'])) { return $latestVersion['version']; diff --git a/src/Checker/Version/MolliePluginLatestVersionCheckerInterface.php b/src/Checker/Version/MolliePluginLatestVersionCheckerInterface.php index 175c5241..2f17152f 100644 --- a/src/Checker/Version/MolliePluginLatestVersionCheckerInterface.php +++ b/src/Checker/Version/MolliePluginLatestVersionCheckerInterface.php @@ -1,15 +1,9 @@ getProduct(); if (null === $product->getProductType()) { - unset($methods['data'][MealVoucher::MEAL_VOUCHERS]); + $key = array_search (MealVoucher::MEAL_VOUCHERS, $methods['data']); + unset($methods['data'][$key]); } } @@ -60,6 +55,6 @@ public function checkTheProductTypeOnCart(OrderInterface $order, array $methods) private function checkVoucherEnabled(array $methods): bool { - return array_key_exists(MealVoucher::MEAL_VOUCHERS, $methods['data']); + return in_array(MealVoucher::MEAL_VOUCHERS, array_values($methods['data'])); } } diff --git a/src/Checker/Voucher/ProductVoucherTypeCheckerInterface.php b/src/Checker/Voucher/ProductVoucherTypeCheckerInterface.php index 5201fbf1..1a0930a1 100644 --- a/src/Checker/Voucher/ProductVoucherTypeCheckerInterface.php +++ b/src/Checker/Voucher/ProductVoucherTypeCheckerInterface.php @@ -1,15 +1,9 @@ twig = $twig; - $this->session = $session; + $this->requestStack = $requestStack; $this->orderRepository = $orderRepository; $this->router = $router; $this->formFactory = $formFactory; @@ -84,7 +78,7 @@ public function __invoke(Request $request): Response try { $paymentlink = $this->paymentlinkResolver->resolve($order, $form->getData(), TemplateMollieEmailInterface::PAYMENT_LINK); - $this->session->getFlashBag()->add('success', $paymentlink); + $this->requestStack->getSession()->getFlashBag()->add('success', $paymentlink); $this->loggerAction->addLog(sprintf('Created payment link to order with id = %s', $order->getId())); @@ -92,12 +86,12 @@ public function __invoke(Request $request): Response } catch (\Exception $e) { $this->loggerAction->addNegativeLog(sprintf('Error with generate payment link with : %s', $e->getMessage())); - $this->session->getFlashBag()->add('error', $e->getMessage()); + $this->requestStack->getSession()->getFlashBag()->add('error', $e->getMessage()); } } return new Response( - $this->twig->render('@BitBagSyliusMolliePlugin/Admin/Paymentlink/_form.html.twig', [ + $this->twig->render('@SyliusMolliePlugin/Admin/Paymentlink/_form.html.twig', [ 'order' => $order, 'form' => $form->createView(), ]) diff --git a/src/Controller/Action/Admin/MethodsAction.php b/src/Controller/Action/Admin/MethodsAction.php index d8151524..906ec772 100644 --- a/src/Controller/Action/Admin/MethodsAction.php +++ b/src/Controller/Action/Admin/MethodsAction.php @@ -1,34 +1,28 @@ loggerAction = $loggerAction; - $this->session = $session; + $this->requestStack = $requestStack; $this->mollieMethodsResolver = $mollieMethodsResolver; $this->methodPurifier = $methodPurifier; $this->gatewayConfigRepository = $gatewayConfigRepository; @@ -63,13 +57,13 @@ public function __invoke(int $id, Request $request): Response $this->methodPurifier->removeAllNoLongerSupportedMethods(); - $this->session->getFlashBag()->add('success', 'bitbag_sylius_mollie_plugin.admin.success_got_methods'); + $this->requestStack->getSession()->getFlashBag()->add('success', 'sylius_mollie_plugin.admin.success_got_methods'); return new Response('OK', Response::HTTP_OK); } catch (ApiException $e) { $this->loggerAction->addNegativeLog(sprintf('API call failed: %s', $e->getMessage())); - $this->session->getFlashBag()->add('error', $e->getMessage()); + $this->requestStack->getSession()->getFlashBag()->add('error', $e->getMessage()); throw new UpdateHandlingException(sprintf('API call failed: %s', htmlspecialchars($e->getMessage()))); } diff --git a/src/Controller/Action/Admin/MollieSubscriptionController.php b/src/Controller/Action/Admin/MollieSubscriptionController.php index 0bc80bbe..4eeb6aa6 100644 --- a/src/Controller/Action/Admin/MollieSubscriptionController.php +++ b/src/Controller/Action/Admin/MollieSubscriptionController.php @@ -1,15 +1,9 @@ paymentRepository = $paymentRepository; $this->payum = $payum; - $this->session = $session; + $this->requestStack = $requestStack; $this->stateMachineFactory = $stateMachineFactory; $this->paymentEntityManager = $paymentEntityManager; $this->loggerAction = $loggerAction; @@ -90,7 +84,7 @@ public function __invoke(Request $request): Response if (false === in_array($factoryName, [MollieGatewayFactory::FACTORY_NAME, MollieSubscriptionGatewayFactory::FACTORY_NAME], true)) { $this->applyStateMachineTransition($payment); - $this->session->getFlashBag()->add('success', 'sylius.payment.refunded'); + $this->requestStack->getSession()->getFlashBag()->add('success', 'sylius.payment.refunded'); $this->loggerAction->addLog(sprintf('Refunded successfully')); return $this->redirectToReferer($request); @@ -101,7 +95,7 @@ public function __invoke(Request $request): Response ) { $this->applyStateMachineTransition($payment); - $this->session->getFlashBag()->add('info', 'bitbag_sylius_mollie_plugin.ui.refunded_only_locally'); + $this->requestStack->getSession()->getFlashBag()->add('info', 'sylius_mollie_plugin.ui.refunded_only_locally'); $this->loggerAction->addLog(sprintf('Refunded only locally')); return $this->redirectToReferer($request); @@ -129,10 +123,10 @@ public function __invoke(Request $request): Response $this->applyStateMachineTransition($payment); - $this->session->getFlashBag()->add('success', 'sylius.payment.refunded'); + $this->requestStack->getSession()->getFlashBag()->add('success', 'sylius.payment.refunded'); } catch (UpdateHandlingException $e) { $this->loggerAction->addNegativeLog(sprintf('Error with refund: %s', $e->getMessage())); - $this->session->getFlashBag()->add('error', $e->getMessage()); + $this->requestStack->getSession()->getFlashBag()->add('error', $e->getMessage()); } return $this->redirectToReferer($request); diff --git a/src/Controller/Action/Admin/TestApiKeysAction.php b/src/Controller/Action/Admin/TestApiKeysAction.php index 7268b330..a0fc9351 100644 --- a/src/Controller/Action/Admin/TestApiKeysAction.php +++ b/src/Controller/Action/Admin/TestApiKeysAction.php @@ -1,17 +1,11 @@ apiKeysTestResolver->fromRequest($request); return new Response($this->twig->render( - '@BitBagSyliusMolliePlugin/Admin/PaymentMethod/testApiKeys.html.twig', + '@SyliusMolliePlugin/Admin/PaymentMethod/testApiKeys.html.twig', [ 'tests' => $data, ] diff --git a/src/Controller/Action/Shop/ApplePayValidationAction.php b/src/Controller/Action/Shop/ApplePayValidationAction.php index 2648dd66..8711d177 100644 --- a/src/Controller/Action/Shop/ApplePayValidationAction.php +++ b/src/Controller/Action/Shop/ApplePayValidationAction.php @@ -1,19 +1,13 @@ get('bitbag_sylius_mollie_plugin.provider.apple.apple_pay_direct_provider'); + $provider = $this->get('sylius_mollie_plugin.provider.apple.apple_pay_direct_provider'); return $provider; } diff --git a/src/Controller/Action/Shop/PaymentFeeCalculateAction.php b/src/Controller/Action/Shop/PaymentFeeCalculateAction.php index 85fac8f4..3ce3b257 100644 --- a/src/Controller/Action/Shop/PaymentFeeCalculateAction.php +++ b/src/Controller/Action/Shop/PaymentFeeCalculateAction.php @@ -1,19 +1,13 @@ $this->twig->render( - 'BitBagSyliusMolliePlugin:Shop/PaymentMollie:_paymentFeeTableTr.html.twig', + 'SyliusMolliePlugin:Shop/PaymentMollie:_paymentFeeTableTr.html.twig', [ 'paymentFee' => $this->convertPriceToAmount->convert(reset($paymentFee)), ] diff --git a/src/Controller/Action/Shop/PaymentFeeCalculateActionInterface.php b/src/Controller/Action/Shop/PaymentFeeCalculateActionInterface.php index b818b510..4a5e18c9 100644 --- a/src/Controller/Action/Shop/PaymentFeeCalculateActionInterface.php +++ b/src/Controller/Action/Shop/PaymentFeeCalculateActionInterface.php @@ -1,17 +1,11 @@ setStatus(self::ERROR_STATUS); - $apiKeyTest->setMessage($this->translator->trans('bitbag_sylius_mollie_plugin.ui.inser_you_key_first')); + $apiKeyTest->setMessage($this->translator->trans('sylius_mollie_plugin.ui.inser_you_key_first')); return $apiKeyTest; } if (MollieGatewayConfigurationType::API_KEY_TEST === $apiKeyTest->getType() && !str_starts_with($key, self::TEST_PREFIX)) { $apiKeyTest->setStatus(self::ERROR_STATUS); - $apiKeyTest->setMessage($this->translator->trans('bitbag_sylius_mollie_plugin.ui.api_key_start_with_api_key_test')); + $apiKeyTest->setMessage($this->translator->trans('sylius_mollie_plugin.ui.api_key_start_with_api_key_test')); return $apiKeyTest; } if (MollieGatewayConfigurationType::API_KEY_LIVE === $apiKeyTest->getType() && !str_starts_with($key, self::LIVE_PREFIX)) { $apiKeyTest->setStatus(self::ERROR_STATUS); - $apiKeyTest->setMessage($this->translator->trans('bitbag_sylius_mollie_plugin.ui.api_key_start_with_api_key_live')); + $apiKeyTest->setMessage($this->translator->trans('sylius_mollie_plugin.ui.api_key_start_with_api_key_live')); return $apiKeyTest; } @@ -80,7 +74,7 @@ private function testApiKey(ApiKeyTest $apiKeyTest, string $apiKey): ApiKeyTest if (0 === $exception->getCode()) { $apiKeyTest->setMessage($this->translator->trans( - \sprintf('bitbag_sylius_mollie_plugin.ui.api_key_start_with_%s', $apiKeyTest->getType()) + \sprintf('sylius_mollie_plugin.ui.api_key_start_with_%s', $apiKeyTest->getType()) )); return $apiKeyTest; diff --git a/src/Creator/ApiKeysTestCreatorInterface.php b/src/Creator/ApiKeysTestCreatorInterface.php index 90341c23..befc1657 100644 --- a/src/Creator/ApiKeysTestCreatorInterface.php +++ b/src/Creator/ApiKeysTestCreatorInterface.php @@ -1,17 +1,11 @@ 'sylius_default.bus', ]; - public const COMMAND_BUS_ALIAS = 'bitbag.sylius_mollie_plugin.command_bus'; + public const COMMAND_BUS_ALIAS = 'sylius_mollie_plugin.command_bus'; private function setupDefaultCommandBus(array $buses, ContainerBuilder $container): void { diff --git a/src/DependencyInjection/BitBagSyliusMollieExtension.php b/src/DependencyInjection/SyliusMollieExtension.php similarity index 72% rename from src/DependencyInjection/BitBagSyliusMollieExtension.php rename to src/DependencyInjection/SyliusMollieExtension.php index cb0b46d0..cbbcb349 100644 --- a/src/DependencyInjection/BitBagSyliusMollieExtension.php +++ b/src/DependencyInjection/SyliusMollieExtension.php @@ -1,15 +1,9 @@ prependExtensionConfig('doctrine_migrations', [ 'migrations_paths' => [ - 'BitBag\SyliusMolliePlugin\Migrations' => __DIR__ . '/../Migrations', + 'SyliusMolliePlugin\Migrations' => __DIR__ . '/../Migrations', ], ]); $container->prependExtensionConfig('sylius_labs_doctrine_migrations_extra', [ 'migrations' => [ - 'BitBag\SyliusMolliePlugin\Migrations' => ['Sylius\Bundle\CoreBundle\Migrations'], + 'SyliusMolliePlugin\Migrations' => ['Sylius\Bundle\CoreBundle\Migrations'], ], ]); } diff --git a/src/Distributor/Order/OrderVoucherDistributor.php b/src/Distributor/Order/OrderVoucherDistributor.php index b4c2bd12..052d6741 100644 --- a/src/Distributor/Order/OrderVoucherDistributor.php +++ b/src/Distributor/Order/OrderVoucherDistributor.php @@ -1,17 +1,11 @@ %s ', self::DOCUMENTATION_LINKS['single_click'], - $this->translator->trans('bitbag_sylius_mollie_plugin.ui.mollie_single_click') + $this->translator->trans('sylius_mollie_plugin.ui.mollie_single_click') ); - return $this->translator->trans('bitbag_sylius_mollie_plugin.ui.read_more_single_click_enabled', [ + return $this->translator->trans('sylius_mollie_plugin.ui.read_more_single_click_enabled', [ '%link%' => $link, ]); } @@ -49,10 +43,10 @@ public function getMollieComponentsDoc(): string $link = \sprintf( ' %s ', self::DOCUMENTATION_LINKS['mollie_components'], - $this->translator->trans('bitbag_sylius_mollie_plugin.ui.mollie_components') + $this->translator->trans('sylius_mollie_plugin.ui.mollie_components') ); - return $this->translator->trans('bitbag_sylius_mollie_plugin.ui.read_more_enable_components', [ + return $this->translator->trans('sylius_mollie_plugin.ui.read_more_enable_components', [ '%link%' => $link, ]); } @@ -61,10 +55,10 @@ public function getPaymentMethodDoc(): string { return \sprintf( '%s %s %s', - $this->translator->trans('bitbag_sylius_mollie_plugin.ui.click'), + $this->translator->trans('sylius_mollie_plugin.ui.click'), self::DOCUMENTATION_LINKS['payment_methods'], - $this->translator->trans('bitbag_sylius_mollie_plugin.ui.here'), - $this->translator->trans('bitbag_sylius_mollie_plugin.ui.payment_methods_doc') + $this->translator->trans('sylius_mollie_plugin.ui.here'), + $this->translator->trans('sylius_mollie_plugin.ui.payment_methods_doc') ); } @@ -72,9 +66,9 @@ public function getProfileIdDoc(): string { return \sprintf( '%s %s ', - $this->translator->trans('bitbag_sylius_mollie_plugin.ui.you_can_find_you_profile_id'), + $this->translator->trans('sylius_mollie_plugin.ui.you_can_find_you_profile_id'), self::DOCUMENTATION_LINKS['profile_id'], - $this->translator->trans('bitbag_sylius_mollie_plugin.ui.mollie_profile_id') + $this->translator->trans('sylius_mollie_plugin.ui.mollie_profile_id') ); } @@ -82,10 +76,10 @@ public function getApiKeyDoc(): string { return \sprintf( '%s %s %s', - $this->translator->trans('bitbag_sylius_mollie_plugin.ui.find_you_api_key'), + $this->translator->trans('sylius_mollie_plugin.ui.find_you_api_key'), self::DOCUMENTATION_LINKS['api_key'], - $this->translator->trans('bitbag_sylius_mollie_plugin.ui.mollie_profile'), - $this->translator->trans('bitbag_sylius_mollie_plugin.ui.it_starts_with') + $this->translator->trans('sylius_mollie_plugin.ui.mollie_profile'), + $this->translator->trans('sylius_mollie_plugin.ui.it_starts_with') ); } } diff --git a/src/Documentation/DocumentationLinksInterface.php b/src/Documentation/DocumentationLinksInterface.php index 14b09350..afa1f993 100644 --- a/src/Documentation/DocumentationLinksInterface.php +++ b/src/Documentation/DocumentationLinksInterface.php @@ -1,15 +1,9 @@ router = $router; $this->translator = $translator; - $this->flashBag = $flashBag; + $this->requestStack = $requestStack; } public function onUpdate(ResourceControllerEvent $event): void @@ -46,12 +40,12 @@ public function onUpdate(ResourceControllerEvent $event): void $url = $this->router->generate('sylius_shop_cart_summary'); $response = new RedirectResponse($url); $event->setResponse($response); - $message = $this->translator->trans('bitbag_sylius_mollie_plugin.order_checkout.colliding_products'); + $message = $this->translator->trans('sylius_mollie_plugin.order_checkout.colliding_products'); $event->stop( $message, ResourceControllerEvent::TYPE_WARNING ); - $this->flashBag->add('error', $message); + $this->requestStack->getSession()->getFlashBag()->add('error', $message); } } } diff --git a/src/EventListener/PaymentMethodUploadLogoListener.php b/src/EventListener/PaymentMethodUploadLogoListener.php index 11753452..1349a910 100644 --- a/src/EventListener/PaymentMethodUploadLogoListener.php +++ b/src/EventListener/PaymentMethodUploadLogoListener.php @@ -1,19 +1,13 @@ getMenu(); $menu ->addChild('recurring') - ->setAttribute('template', '@BitBagSyliusMolliePlugin/ProductVariant/Tab/_recurring.html.twig') - ->setLabel('bitbag_sylius_mollie_plugin.ui.product_variant.tab.recurring') + ->setAttribute('template', '@SyliusMolliePlugin/ProductVariant/Tab/_recurring.html.twig') + ->setLabel('sylius_mollie_plugin.ui.product_variant.tab.recurring') ; } } diff --git a/src/EventListener/RefundPaymentGeneratedAutoCompleteListener.php b/src/EventListener/RefundPaymentGeneratedAutoCompleteListener.php index a89a2c12..77fe17ec 100644 --- a/src/EventListener/RefundPaymentGeneratedAutoCompleteListener.php +++ b/src/EventListener/RefundPaymentGeneratedAutoCompleteListener.php @@ -1,18 +1,12 @@ defaults([ 'payum.factory_name' => self::FACTORY_NAME, 'payum.factory_title' => 'Mollie', - 'payum.http_client' => '@bitbag_sylius_mollie_plugin.mollie_api_client', + 'payum.http_client' => '@sylius_mollie_plugin.mollie_api_client', ]); if (false === (bool) $config['payum.api']) { @@ -52,7 +46,7 @@ protected function populateConfig(ArrayObject $config): void $mollieApiClient->setApiKey($config[$environment]); $mollieApiClient->setConfig($config->toUnsafeArray()); $mollieApiClient->addVersionString(\sprintf('Sylius/%s', Kernel::VERSION)); - $mollieApiClient->addVersionString(\sprintf('BitBagSyliusMolliePlugin/%s', $mollieApiClient->getVersion())); + $mollieApiClient->addVersionString(\sprintf('SyliusMolliePlugin/%s', $mollieApiClient->getVersion())); $mollieApiClient->addVersionString(\sprintf('uap/%s', $mollieApiClient->getUserAgentToken())); return $mollieApiClient; diff --git a/src/Factory/MollieGatewayFactoryInterface.php b/src/Factory/MollieGatewayFactoryInterface.php index 837fca91..7042337d 100644 --- a/src/Factory/MollieGatewayFactoryInterface.php +++ b/src/Factory/MollieGatewayFactoryInterface.php @@ -1,15 +1,9 @@ getVariant(); - if (false === $variant instanceof ProductVariantInterface) { + if (!$variant) { throw new \InvalidArgumentException( sprintf('Variant should be instance of "%s::class".', ProductVariantInterface::class) ); diff --git a/src/Factory/MollieSubscriptionFactoryInterface.php b/src/Factory/MollieSubscriptionFactoryInterface.php index 2df26fa3..65f9a19c 100644 --- a/src/Factory/MollieSubscriptionFactoryInterface.php +++ b/src/Factory/MollieSubscriptionFactoryInterface.php @@ -1,18 +1,12 @@ defaults([ 'payum.factory_name' => self::FACTORY_NAME, 'payum.factory_title' => 'Mollie subscription', - 'payum.http_client' => '@bitbag_sylius_mollie_plugin.mollie_api_client', + 'payum.http_client' => '@sylius_mollie_plugin.mollie_api_client', ]); if (false === (bool) $config['payum.api']) { @@ -54,7 +48,7 @@ protected function populateConfig(ArrayObject $config): void $mollieApiClient->setConfig($config->toUnsafeArray()); $mollieApiClient->setIsRecurringSubscription(true); $mollieApiClient->addVersionString(\sprintf('Sylius/%s', Kernel::VERSION)); - $mollieApiClient->addVersionString(\sprintf('BitBagSyliusMolliePlugin/%s', $mollieApiClient->getVersion())); + $mollieApiClient->addVersionString(\sprintf('SyliusMolliePlugin/%s', $mollieApiClient->getVersion())); $mollieApiClient->addVersionString(\sprintf('uap/%s', $mollieApiClient->getUserAgentToken())); return $mollieApiClient; diff --git a/src/Factory/MollieSubscriptionScheduleFactory.php b/src/Factory/MollieSubscriptionScheduleFactory.php index 03e824bf..817d15cd 100644 --- a/src/Factory/MollieSubscriptionScheduleFactory.php +++ b/src/Factory/MollieSubscriptionScheduleFactory.php @@ -1,18 +1,12 @@ add('productType', EntityType::class, [ 'class' => ProductType::class, - 'label' => 'bitbag_sylius_mollie_plugin.form.product_type', - 'placeholder' => 'bitbag_sylius_mollie_plugin.form.product_type_none', + 'label' => 'sylius_mollie_plugin.form.product_type', + 'placeholder' => 'sylius_mollie_plugin.form.product_type_none', 'empty_data' => null, ]); } diff --git a/src/Form/Extension/ProductVariantRecurringExtension.php b/src/Form/Extension/ProductVariantRecurringExtension.php index ee7d36dc..133200ee 100644 --- a/src/Form/Extension/ProductVariantRecurringExtension.php +++ b/src/Form/Extension/ProductVariantRecurringExtension.php @@ -1,18 +1,12 @@ add('recurring', CheckboxType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.form.product_variant.recurring', - 'help' => 'bitbag_sylius_mollie_plugin.form.product_variant.recurring_help', + 'label' => 'sylius_mollie_plugin.form.product_variant.recurring', + 'help' => 'sylius_mollie_plugin.form.product_variant.recurring_help', 'required' => false, 'constraints' => [ new NotNull(), ], ]) ->add('times', NumberType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.form.product_variant.times', - 'help' => 'bitbag_sylius_mollie_plugin.form.product_variant.times_help', + 'label' => 'sylius_mollie_plugin.form.product_variant.times', + 'help' => 'sylius_mollie_plugin.form.product_variant.times_help', 'required' => false, 'constraints' => [ new Range([ 'min' => 2, - 'minMessage' => 'bitbag_sylius_mollie_plugin.times.min_range', + 'minMessage' => 'sylius_mollie_plugin.times.min_range', 'groups' => ['recurring_product_variant'], ]), new IsNull([ @@ -72,7 +66,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'groups' => ['recurring_product_variant'], ]), new NotBlank([ - 'message' => 'bitbag_sylius_mollie_plugin.interval.not_blank', + 'message' => 'sylius_mollie_plugin.interval.not_blank', 'groups' => ['recurring_product_variant'], ]), ], diff --git a/src/Form/Transformer/MollieIntervalTransformer.php b/src/Form/Transformer/MollieIntervalTransformer.php index fc0e71fd..dedae1df 100644 --- a/src/Form/Transformer/MollieIntervalTransformer.php +++ b/src/Form/Transformer/MollieIntervalTransformer.php @@ -1,17 +1,11 @@ add('file', FileType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.customize_image', + 'label' => 'sylius_mollie_plugin.ui.customize_image', 'required' => false, ]); } diff --git a/src/Form/Type/DirectDebitType.php b/src/Form/Type/DirectDebitType.php index b0e8786c..58d59d1d 100644 --- a/src/Form/Type/DirectDebitType.php +++ b/src/Form/Type/DirectDebitType.php @@ -1,67 +1,61 @@ session = $session; + $this->requestStack = $requestStack; } public function buildForm(FormBuilderInterface $builder, array $options): void { $builder ->add('consumerName', TextType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.consumer_name', + 'label' => 'sylius_mollie_plugin.ui.consumer_name', 'constraints' => [ new NotBlank([ - 'message' => 'bitbag_sylius_mollie_plugin.consumer_name.not_blank', + 'message' => 'sylius_mollie_plugin.consumer_name.not_blank', 'groups' => ['sylius'], ]), ], - 'data' => $this->session->get('mollie_direct_debit_data')['consumerName'] ?? null, + 'data' => $this->requestStack->getSession()->get('mollie_direct_debit_data')['consumerName'] ?? null, ]) ->add('iban', TextType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.iban', + 'label' => 'sylius_mollie_plugin.ui.iban', 'constraints' => [ new NotBlank([ - 'message' => 'bitbag_sylius_mollie_plugin.iban.not_blank', + 'message' => 'sylius_mollie_plugin.iban.not_blank', 'groups' => ['sylius'], ]), new Iban([ - 'message' => 'bitbag_sylius_mollie_plugin.iban.incorrect', + 'message' => 'sylius_mollie_plugin.iban.incorrect', 'groups' => ['sylius'], ]), ], - 'data' => $this->session->get('mollie_direct_debit_data')['iban'] ?? null, + 'data' => $this->requestStack->getSession()->get('mollie_direct_debit_data')['iban'] ?? null, ]) ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event): void { $data = $event->getData(); - $this->session->set('mollie_direct_debit_data', $data); + $this->requestStack->getSession()->set('mollie_direct_debit_data', $data); }) ; } diff --git a/src/Form/Type/MollieGatewayConfigType.php b/src/Form/Type/MollieGatewayConfigType.php index 64501fc8..316314e1 100644 --- a/src/Form/Type/MollieGatewayConfigType.php +++ b/src/Form/Type/MollieGatewayConfigType.php @@ -1,26 +1,20 @@ add('enabled', CheckboxType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.enable', + 'label' => 'sylius_mollie_plugin.ui.enable', ]) ->add('applePayDirectButton', CheckboxType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.enabled_buy_now_button', - 'help' => 'bitbag_sylius_mollie_plugin.form.enabled_buy_now_button_help', + 'label' => 'sylius_mollie_plugin.ui.enabled_buy_now_button', + 'help' => 'sylius_mollie_plugin.form.enabled_buy_now_button_help', ]) ->add('defaultCategory', EntityType::class, [ 'class' => ProductType::class, - 'label' => 'bitbag_sylius_mollie_plugin.form.product_type_default', - 'placeholder' => 'bitbag_sylius_mollie_plugin.form.no_category', + 'label' => 'sylius_mollie_plugin.form.product_type_default', + 'placeholder' => 'sylius_mollie_plugin.form.no_category', 'empty_data' => null, - 'help' => 'bitbag_sylius_mollie_plugin.form.product_type_default_help', + 'help' => 'sylius_mollie_plugin.form.product_type_default_help', ]) ->add('translations', ResourceTranslationsType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.payment_name', + 'label' => 'sylius_mollie_plugin.ui.payment_name', 'entry_type' => MollieGatewayConfigTranslationType::class, ]) ->add('paymentType', ChoiceType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.payment_type', + 'label' => 'sylius_mollie_plugin.ui.payment_type', 'choices' => Options::getAvailablePaymentType(), 'help' => $this->documentationLinks->getPaymentMethodDoc(), 'help_html' => true, ]) ->add('paymentDescription', TextType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.form.payment_methods.payment_description', - 'help' => 'bitbag_sylius_mollie_plugin.form.payment_methods.payment_description_help', + 'label' => 'sylius_mollie_plugin.form.payment_methods.payment_description', + 'help' => 'sylius_mollie_plugin.form.payment_methods.payment_description_help', 'empty_data' => '{ordernumber}', 'attr' => [ 'placeholder' => '{ordernumber}', @@ -95,26 +89,26 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'label' => false, ]) ->add('country_restriction', ChoiceType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.country_level_restriction', + 'label' => 'sylius_mollie_plugin.ui.country_level_restriction', 'choices' => CountryOptions::getCountriesConfigOptions(), ]) ->add('countryLevel_excluded', CountryType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.country_level_exclude', + 'label' => 'sylius_mollie_plugin.ui.country_level_exclude', 'required' => false, 'multiple' => true, ]) ->add('countryLevel_allowed', CountryType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.country_level_allow', + 'label' => 'sylius_mollie_plugin.ui.country_level_allow', 'required' => false, 'multiple' => true, ]) ->add('countryLevel', CountryType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.country_level_restriction', + 'label' => 'sylius_mollie_plugin.ui.country_level_restriction', 'required' => false, 'multiple' => true, ]) ->add('orderExpiration', ChoiceType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.order_expiration_days', + 'label' => 'sylius_mollie_plugin.ui.order_expiration_days', 'required' => false, 'choices' => array_combine( range(1, 100, 1), @@ -122,10 +116,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void ), ]) ->add('loggerEnabled', CheckboxType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.debug_level_enabled', + 'label' => 'sylius_mollie_plugin.ui.debug_level_enabled', ]) ->add('loggerLevel', ChoiceType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.debug_level_log', + 'label' => 'sylius_mollie_plugin.ui.debug_level_log', 'choices' => Options::getDebugLevels(), ]) ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event): void { @@ -139,7 +133,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void if (MollieSubscriptionGatewayFactory::FACTORY_NAME === $factoryName) { $form->remove('paymentType'); $form->add('paymentType', ChoiceType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.payment_type', + 'label' => 'sylius_mollie_plugin.ui.payment_type', 'choices' => Options::getAvailablePaymentType(), 'help' => $this->documentationLinks->getPaymentMethodDoc(), 'help_html' => true, @@ -165,7 +159,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void if (in_array($object->getMethodId(), Options::getOnlyOrderAPIMethods(), true)) { $form->remove('paymentType'); $form->add('paymentType', ChoiceType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.payment_type', + 'label' => 'sylius_mollie_plugin.ui.payment_type', 'choices' => Options::getAvailablePaymentType(), 'help' => $this->documentationLinks->getPaymentMethodDoc(), 'help_html' => true, @@ -192,7 +186,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void public function getBlockPrefix(): string { - return 'bitbag_mollie_payment_method'; + return 'mollie_payment_method'; } public static function getExtendedTypes(): array diff --git a/src/Form/Type/MollieGatewayConfigurationType.php b/src/Form/Type/MollieGatewayConfigurationType.php index 6fcab3d9..39e9526b 100644 --- a/src/Form/Type/MollieGatewayConfigurationType.php +++ b/src/Form/Type/MollieGatewayConfigurationType.php @@ -1,19 +1,13 @@ add('environment', ChoiceType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.environment', + 'label' => 'sylius_mollie_plugin.ui.environment', 'choices' => [ - 'bitbag_sylius_mollie_plugin.ui.api_key_choice_test' => null, - 'bitbag_sylius_mollie_plugin.ui.api_key_choice_live' => true, + 'sylius_mollie_plugin.ui.api_key_choice_test' => null, + 'sylius_mollie_plugin.ui.api_key_choice_live' => true, ], ]) ->add('profile_id', TextType::class, [ 'label' => $this->documentationLinks->getProfileIdDoc(), 'constraints' => [ new NotBlank([ - 'message' => 'bitbag_sylius_mollie_plugin.profile_id.not_blank', + 'message' => 'sylius_mollie_plugin.profile_id.not_blank', 'groups' => ['sylius'], ]), ], @@ -65,16 +59,16 @@ public function buildForm(FormBuilderInterface $builder, array $options): void 'help' => ' ', 'constraints' => [ new NotBlank([ - 'message' => 'bitbag_sylius_mollie_plugin.api_key.not_blank', + 'message' => 'sylius_mollie_plugin.api_key.not_blank', 'groups' => ['sylius'], ]), new Regex([ - 'message' => 'bitbag_sylius_mollie_plugin.api_key.invalid_test', + 'message' => 'sylius_mollie_plugin.api_key.invalid_test', 'groups' => ['sylius'], 'pattern' => '/^(test)_\w{0,}$/', ]), new Length([ - 'minMessage' => 'bitbag_sylius_mollie_plugin.api_key.min_length', + 'minMessage' => 'sylius_mollie_plugin.api_key.min_length', 'groups' => ['sylius'], 'min' => 35, ]), @@ -83,44 +77,44 @@ public function buildForm(FormBuilderInterface $builder, array $options): void ->add(self::API_KEY_LIVE, PasswordType::class, [ 'always_empty' => false, 'required' => true, - 'label' => 'bitbag_sylius_mollie_plugin.ui.api_key_live', + 'label' => 'sylius_mollie_plugin.ui.api_key_live', 'constraints' => [ new Regex([ - 'message' => 'bitbag_sylius_mollie_plugin.api_key.invalid_live', + 'message' => 'sylius_mollie_plugin.api_key.invalid_live', 'groups' => ['sylius'], 'pattern' => '/^(live)_\w{0,}$/', ]), new Length([ - 'minMessage' => 'bitbag_sylius_mollie_plugin.api_key.min_length', + 'minMessage' => 'sylius_mollie_plugin.api_key.min_length', 'groups' => ['sylius'], 'min' => 35, ]), ], ]) ->add('abandoned_email_enabled', CheckboxType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.abandoned_email_enabled', - 'help' => 'bitbag_sylius_mollie_plugin.ui.abandoned_description', + 'label' => 'sylius_mollie_plugin.ui.abandoned_email_enabled', + 'help' => 'sylius_mollie_plugin.ui.abandoned_description', ]) ->add('abandoned_hours', ChoiceType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.abandoned_hours', + 'label' => 'sylius_mollie_plugin.ui.abandoned_hours', 'choices' => array_combine( range(1, 200, 1), range(1, 200, 1) ), ]) ->add('loggerLevel', ChoiceType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.debug_level_log', + 'label' => 'sylius_mollie_plugin.ui.debug_level_log', 'choices' => Options::getDebugLevels(), ]) ->add('components', CheckboxType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.enable_components', - 'attr' => ['class' => 'bitbag-mollie-components'], + 'label' => 'sylius_mollie_plugin.ui.enable_components', + 'attr' => ['class' => 'mollie-components'], 'help' => $this->documentationLinks->getMollieComponentsDoc(), 'help_html' => true, ]) ->add('single_click_enabled', CheckboxType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.single_click_enabled', - 'attr' => ['class' => 'bitbag-single-click-payment'], + 'label' => 'sylius_mollie_plugin.ui.single_click_enabled', + 'attr' => ['class' => 'mollie-single-click-payment'], 'help' => $this->documentationLinks->getSingleClickDoc(), 'help_html' => true, ]) @@ -131,7 +125,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void $data['single_click_enabled'] = false; } - $data['payum.http_client'] = '@bitbag_sylius_mollie_plugin.mollie_api_client'; + $data['payum.http_client'] = '@sylius_mollie_plugin.mollie_api_client'; $event->setData($data); }); @@ -139,7 +133,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void public function getBlockPrefix(): string { - return 'bitbag_mollie_gateway_configuration_type'; + return 'mollie_gateway_configuration_type'; } public function configureOptions(OptionsResolver $resolver): void diff --git a/src/Form/Type/MollieGatewayMethodsAutocompleteChoiceType.php b/src/Form/Type/MollieGatewayMethodsAutocompleteChoiceType.php index ca08a583..940c3554 100644 --- a/src/Form/Type/MollieGatewayMethodsAutocompleteChoiceType.php +++ b/src/Form/Type/MollieGatewayMethodsAutocompleteChoiceType.php @@ -1,15 +1,9 @@ setDefaults([ - 'resource' => 'bitbag_sylius_mollie_plugin.mollie_gateway_config', + 'resource' => 'sylius_mollie_plugin.mollie_gateway_config', 'choice_name' => 'methodId', 'choice_value' => 'id', 'label' => false, @@ -40,7 +34,7 @@ public function buildView( public function getBlockPrefix(): string { - return 'bitbag_sylius_mollie_plugin_mollie_gateway_config_autocomplete_choice'; + return 'sylius_mollie_plugin_mollie_gateway_config_autocomplete_choice'; } public function getParent(): string diff --git a/src/Form/Type/MollieIntervalType.php b/src/Form/Type/MollieIntervalType.php index 6beed2ad..e8b4bca3 100644 --- a/src/Form/Type/MollieIntervalType.php +++ b/src/Form/Type/MollieIntervalType.php @@ -1,17 +1,11 @@ false, 'choice_label' => function (string $value): string { return sprintf( - 'bitbag_sylius_mollie_plugin.form.product_variant.interval_configuration.steps.%s', + 'sylius_mollie_plugin.form.product_variant.interval_configuration.steps.%s', $value ); }, @@ -65,7 +59,7 @@ public function configureOptions(OptionsResolver $resolver): void { $resolver->setDefaults([ 'compound' => true, - 'label_format' => 'bitbag_sylius_mollie_plugin.form.product_variant.interval_configuration.%name%', + 'label_format' => 'sylius_mollie_plugin.form.product_variant.interval_configuration.%name%', 'error_bubbling' => true, ]); } diff --git a/src/Form/Type/MollieLoggerLevelFilterType.php b/src/Form/Type/MollieLoggerLevelFilterType.php index 422a4255..14089319 100644 --- a/src/Form/Type/MollieLoggerLevelFilterType.php +++ b/src/Form/Type/MollieLoggerLevelFilterType.php @@ -1,17 +1,11 @@ function (string $value): string { - return sprintf('bitbag_sylius_mollie_plugin.ui.subscription.state.%s', $value); + return sprintf('sylius_mollie_plugin.ui.subscription.state.%s', $value); }, 'expanded' => true, 'multiple' => true, diff --git a/src/Form/Type/PartialShip/PartialShipType.php b/src/Form/Type/PartialShip/PartialShipType.php index cbd85095..de65a5c3 100644 --- a/src/Form/Type/PartialShip/PartialShipType.php +++ b/src/Form/Type/PartialShip/PartialShipType.php @@ -1,15 +1,9 @@ add('tracking', TextType::class, [ 'required' => false, - 'label' => 'bitbag_sylius_mollie_plugin.form.shipment.tracking_code', - 'attr' => ['placeholder' => 'bitbag_sylius_mollie_plugin.form.shipment.tracking_code'], + 'label' => 'sylius_mollie_plugin.form.shipment.tracking_code', + 'attr' => ['placeholder' => 'sylius_mollie_plugin.form.shipment.tracking_code'], ]) ->add('units', ShippingUnitsChoiceType::class, [ 'choices' => $options['shipment']->getUnits(), - 'label' => 'bitbag_sylius_mollie_plugin.form.shipment.units', + 'label' => 'sylius_mollie_plugin.form.shipment.units', 'multiple' => true, 'constraints' => [ new Count(['min' => 1, 'groups' => ['sylius']]), @@ -64,6 +58,6 @@ public function configureOptions(OptionsResolver $resolver): void public function getBlockPrefix(): string { - return 'bitbag_partial_shipment_ship'; + return 'mollie_partial_shipment_ship'; } } diff --git a/src/Form/Type/PartialShip/ShippingUnitsChoiceType.php b/src/Form/Type/PartialShip/ShippingUnitsChoiceType.php index 62483237..2dbe7d77 100644 --- a/src/Form/Type/PartialShip/ShippingUnitsChoiceType.php +++ b/src/Form/Type/PartialShip/ShippingUnitsChoiceType.php @@ -1,15 +1,9 @@ methodResolver = $methodResolver; - $this->session = $session; } public function buildForm(FormBuilderInterface $builder, array $options): void diff --git a/src/Form/Type/PaymentSurchargeFeeType.php b/src/Form/Type/PaymentSurchargeFeeType.php index 601251b8..ac432648 100644 --- a/src/Form/Type/PaymentSurchargeFeeType.php +++ b/src/Form/Type/PaymentSurchargeFeeType.php @@ -1,18 +1,12 @@ add('type', ChoiceType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.payment_fee_type', - 'choices' => ['bitbag_sylius_mollie_plugin.ui.no_fee' => 'no_fee'] + Options::getAvailablePaymentSurchargeFeeType(), + 'label' => 'sylius_mollie_plugin.ui.payment_fee_type', + 'choices' => ['sylius_mollie_plugin.ui.no_fee' => 'no_fee'] + Options::getAvailablePaymentSurchargeFeeType(), ]) ->add('fixedAmount', NumberType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.fix_amount_surcharge', - 'attr' => ['class' => 'bitbag-mollie-payment_fee-fixedAmount'], + 'label' => 'sylius_mollie_plugin.ui.fix_amount_surcharge', + 'attr' => ['class' => 'mollie-payment_fee-fixedAmount'], 'constraints' => [ new GreaterThan([ 'value' => 0, - 'message' => 'bitbag_sylius_mollie_plugin.form.error.greater_than', + 'message' => 'sylius_mollie_plugin.form.error.greater_than', 'groups' => ['sylius'], ]), ], ]) ->add('percentage', NumberType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.percentage_surcharge', + 'label' => 'sylius_mollie_plugin.ui.percentage_surcharge', 'constraints' => [ new GreaterThan([ 'value' => 0, - 'message' => 'bitbag_sylius_mollie_plugin.form.error.greater_than', + 'message' => 'sylius_mollie_plugin.form.error.greater_than', 'groups' => ['sylius'], ]), ], ]) ->add('surchargeLimit', NumberType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.surcharge_limit', + 'label' => 'sylius_mollie_plugin.ui.surcharge_limit', 'constraints' => [ new GreaterThan([ 'value' => 0, - 'message' => 'bitbag_sylius_mollie_plugin.form.error.greater_than', + 'message' => 'sylius_mollie_plugin.form.error.greater_than', 'groups' => ['sylius'], ]), ], diff --git a/src/Form/Type/PaymentlinkType.php b/src/Form/Type/PaymentlinkType.php index 59624c06..296357c4 100644 --- a/src/Form/Type/PaymentlinkType.php +++ b/src/Form/Type/PaymentlinkType.php @@ -1,17 +1,11 @@ add('methods', EntityType::class, [ 'class' => MollieGatewayConfig::class, 'multiple' => true, - 'label' => 'bitbag_sylius_mollie_plugin.form.methods', + 'label' => 'sylius_mollie_plugin.form.methods', 'required' => false, ]) ; diff --git a/src/Form/Type/ProductTypeType.php b/src/Form/Type/ProductTypeType.php index b70d5b15..29b4954d 100644 --- a/src/Form/Type/ProductTypeType.php +++ b/src/Form/Type/ProductTypeType.php @@ -1,18 +1,12 @@ add('type', ChoiceType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.template_type', + 'label' => 'sylius_mollie_plugin.ui.template_type', 'choices' => Options::getAvailableEmailTemplate(), ]) ->add('styleCss', TextareaType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.style_css', + 'label' => 'sylius_mollie_plugin.ui.style_css', ]) ->add('translations', ResourceTranslationsType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.template_contents', + 'label' => 'sylius_mollie_plugin.ui.template_contents', 'entry_type' => TemplateMollieEmailTranslationType::class, + 'validation_groups' => ['sylius'], + 'constraints' => [ + new Valid(), + ], ]) ; } public function getBlockPrefix(): string { - return 'bitbag_sylius_mollie_plugin_template_mollie_email'; + return 'sylius_mollie_plugin_template_mollie_email'; + } + + public function configureOptions(OptionsResolver $resolver): void + { + $resolver->setDefaults([ + 'data_class' => TemplateMollieEmail::class, + 'constraints' => [ + new UniqueEntity(['fields' => ['type']]), + ], + ]); } } diff --git a/src/Form/Type/Translation/MollieGatewayConfigTranslationType.php b/src/Form/Type/Translation/MollieGatewayConfigTranslationType.php index ca2e091d..c35184bd 100644 --- a/src/Form/Type/Translation/MollieGatewayConfigTranslationType.php +++ b/src/Form/Type/Translation/MollieGatewayConfigTranslationType.php @@ -1,15 +1,9 @@ add('name', TextType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.payment_name', + 'label' => 'sylius_mollie_plugin.ui.payment_name', ]) ; } public function getBlockPrefix(): string { - return 'bitbag_mollie_payment_method_translation'; + return 'mollie_payment_method_translation'; } } diff --git a/src/Form/Type/Translation/TemplateMollieEmailTranslationType.php b/src/Form/Type/Translation/TemplateMollieEmailTranslationType.php index 4f1c2536..4124dbe6 100644 --- a/src/Form/Type/Translation/TemplateMollieEmailTranslationType.php +++ b/src/Form/Type/Translation/TemplateMollieEmailTranslationType.php @@ -1,15 +1,9 @@ add('name', TextType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.template_name', + 'label' => 'sylius_mollie_plugin.ui.template_name', ]) ->add('subject', TextType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.template_subject', + 'label' => 'sylius_mollie_plugin.ui.template_subject', ]) ->add('content', TextareaType::class, [ - 'label' => 'bitbag_sylius_mollie_plugin.ui.template_content', + 'label' => 'sylius_mollie_plugin.ui.template_content', ]) ; } public function getBlockPrefix(): string { - return 'bitbag_sylius_mollie_plugin_template_mollie_email_translation'; + return 'sylius_mollie_plugin_template_mollie_email_translation'; } } diff --git a/src/Generator/SubscriptionScheduleGenerator.php b/src/Generator/SubscriptionScheduleGenerator.php index ff01ffb9..080c86de 100644 --- a/src/Generator/SubscriptionScheduleGenerator.php +++ b/src/Generator/SubscriptionScheduleGenerator.php @@ -1,19 +1,13 @@ addChild('paymentlink', [ - 'route' => 'bitbag_sylius_mollie_plugin_paymentlink', + 'route' => 'sylius_mollie_plugin_paymentlink', 'routeParameters' => ['orderNumber' => $order->getNumber()], ]) ->setAttribute('type', 'transition') - ->setLabel('bitbag_sylius_mollie_plugin.ui.paymentlink_generate') + ->setLabel('sylius_mollie_plugin.ui.paymentlink_generate') ->setLabelAttribute('icon', 'link all') ->setLabelAttribute('color', 'blue'); } diff --git a/src/Menu/MollieEmailTemplateMenuListener.php b/src/Menu/MollieEmailTemplateMenuListener.php index 17c5d935..95334c38 100644 --- a/src/Menu/MollieEmailTemplateMenuListener.php +++ b/src/Menu/MollieEmailTemplateMenuListener.php @@ -1,16 +1,9 @@ addChild('mollie_email_template', [ - 'route' => 'bitbag_sylius_mollie_plugin_admin_template_mollie_email_index', + 'route' => 'sylius_mollie_plugin_admin_template_mollie_email_index', ]) - ->setLabel('bitbag_sylius_mollie_plugin.ui.template_mollie_emails') + ->setLabel('sylius_mollie_plugin.ui.template_mollie_emails') ->setLabelAttribute('icon', 'envelope'); } } diff --git a/src/Menu/MollieMenuListener.php b/src/Menu/MollieMenuListener.php index 113f10b5..ff0ddcc9 100644 --- a/src/Menu/MollieMenuListener.php +++ b/src/Menu/MollieMenuListener.php @@ -1,16 +1,9 @@ addChild('mollie') - ->setLabel('bitbag_sylius_mollie_plugin.ui.mollie_gateway_label'); + ->setLabel('sylius_mollie_plugin.ui.mollie_gateway_label'); $menuItem ->addChild('mollie_logger', [ - 'route' => 'bitbag_sylius_mollie_plugin_admin_mollie_logger_index', + 'route' => 'sylius_mollie_plugin_admin_mollie_logger_index', ]) - ->setLabel('bitbag_sylius_mollie_plugin.ui.mollie_loggers') + ->setLabel('sylius_mollie_plugin.ui.mollie_loggers') ->setLabelAttribute('icon', 'tags'); $menuItem ->addChild('mollie_product_type', [ - 'route' => 'bitbag_sylius_mollie_plugin_admin_product_type_index', + 'route' => 'sylius_mollie_plugin_admin_product_type_index', ]) - ->setLabel('bitbag_sylius_mollie_plugin.ui.mollie_product_type') + ->setLabel('sylius_mollie_plugin.ui.mollie_product_type') ->setLabelAttribute('icon', 'sitemap'); } } diff --git a/src/Menu/MollieRecurringMenuListener.php b/src/Menu/MollieRecurringMenuListener.php index 0c13a5b8..e80685bc 100644 --- a/src/Menu/MollieRecurringMenuListener.php +++ b/src/Menu/MollieRecurringMenuListener.php @@ -1,15 +1,9 @@ addChild('mollie_subscriptions', [ - 'route' => 'bitbag_sylius_mollie_plugin_admin_mollie_subscription_index', + 'route' => 'sylius_mollie_plugin_admin_mollie_subscription_index', ]) - ->setLabel('bitbag_sylius_mollie_plugin.ui.mollie_subscriptions') + ->setLabel('sylius_mollie_plugin.ui.mollie_subscriptions') ->setLabelAttribute('icon', 'cart') ; } diff --git a/src/Migrations/Version20200513092722.php b/src/Migrations/Version20200513092722.php index 15ab2694..15aeb234 100644 --- a/src/Migrations/Version20200513092722.php +++ b/src/Migrations/Version20200513092722.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -19,15 +19,15 @@ public function up(Schema $schema): void // this up() migration is auto-generated, please modify it to your needs $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); - $this->addSql('CREATE TABLE bitbag_mollie_configuration (id INT AUTO_INCREMENT NOT NULL, payment_surcharge_fee INT DEFAULT NULL, method_image_id INT DEFAULT NULL, gateway_id INT DEFAULT NULL, method_id VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, enabled TINYINT(1) NOT NULL, image LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', minimum_amount LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', maximum_amount LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', payment_type VARCHAR(255) NOT NULL, country LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', can_refunded TINYINT(1) NOT NULL, issuers LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', country_level LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', order_expiration INT DEFAULT NULL, UNIQUE INDEX UNIQ_23CC85045E237E06 (name), UNIQUE INDEX UNIQ_23CC8504EB71DAB7 (payment_surcharge_fee), UNIQUE INDEX UNIQ_23CC8504DBC26BFF (method_image_id), INDEX IDX_23CC8504577F8E00 (gateway_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE bitbag_subscription (id INT AUTO_INCREMENT NOT NULL, order_id INT DEFAULT NULL, subscription_id VARCHAR(255) DEFAULT NULL, customer_id VARCHAR(255) DEFAULT NULL, state VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_97993F5D9A1887DC (subscription_id), UNIQUE INDEX UNIQ_97993F5D9395C3F3 (customer_id), UNIQUE INDEX UNIQ_97993F5D8D9F6D38 (order_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE bitbag_mollie_method_image (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(255) DEFAULT NULL, path VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE bitbag_mollie_logger (id INT AUTO_INCREMENT NOT NULL, level INT NOT NULL, error_code INT NOT NULL, message VARCHAR(255) NOT NULL, date_time DATETIME NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE bitbag_mollie_configuration_surcharge_fee (id INT AUTO_INCREMENT NOT NULL, type VARCHAR(255) DEFAULT NULL, fixed_amount DOUBLE PRECISION DEFAULT NULL, percentage DOUBLE PRECISION DEFAULT NULL, surcharge_limit DOUBLE PRECISION DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration ADD CONSTRAINT FK_23CC8504EB71DAB7 FOREIGN KEY (payment_surcharge_fee) REFERENCES bitbag_mollie_configuration_surcharge_fee (id)'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration ADD CONSTRAINT FK_23CC8504DBC26BFF FOREIGN KEY (method_image_id) REFERENCES bitbag_mollie_method_image (id)'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration ADD CONSTRAINT FK_23CC8504577F8E00 FOREIGN KEY (gateway_id) REFERENCES sylius_gateway_config (id)'); - $this->addSql('ALTER TABLE bitbag_subscription ADD CONSTRAINT FK_97993F5D8D9F6D38 FOREIGN KEY (order_id) REFERENCES sylius_order (id)'); + $this->addSql('CREATE TABLE mollie_configuration (id INT AUTO_INCREMENT NOT NULL, payment_surcharge_fee INT DEFAULT NULL, method_image_id INT DEFAULT NULL, gateway_id INT DEFAULT NULL, method_id VARCHAR(255) NOT NULL, name VARCHAR(255) NOT NULL, enabled TINYINT(1) NOT NULL, image LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', minimum_amount LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', maximum_amount LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', payment_type VARCHAR(255) NOT NULL, country LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', can_refunded TINYINT(1) NOT NULL, issuers LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', country_level LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', order_expiration INT DEFAULT NULL, UNIQUE INDEX UNIQ_23CC85045E237E06 (name), UNIQUE INDEX UNIQ_23CC8504EB71DAB7 (payment_surcharge_fee), UNIQUE INDEX UNIQ_23CC8504DBC26BFF (method_image_id), INDEX IDX_23CC8504577F8E00 (gateway_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('CREATE TABLE mollie_subscription_first (id INT AUTO_INCREMENT NOT NULL, order_id INT DEFAULT NULL, subscription_id VARCHAR(255) DEFAULT NULL, customer_id VARCHAR(255) DEFAULT NULL, state VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_97993F5D9A1887DC (subscription_id), UNIQUE INDEX UNIQ_97993F5D9395C3F3 (customer_id), UNIQUE INDEX UNIQ_97993F5D8D9F6D38 (order_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('CREATE TABLE mollie_method_image (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(255) DEFAULT NULL, path VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('CREATE TABLE mollie_logger (id INT AUTO_INCREMENT NOT NULL, level INT NOT NULL, error_code INT NOT NULL, message VARCHAR(255) NOT NULL, date_time DATETIME NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('CREATE TABLE mollie_configuration_surcharge_fee (id INT AUTO_INCREMENT NOT NULL, type VARCHAR(255) DEFAULT NULL, fixed_amount DOUBLE PRECISION DEFAULT NULL, percentage DOUBLE PRECISION DEFAULT NULL, surcharge_limit DOUBLE PRECISION DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('ALTER TABLE mollie_configuration ADD CONSTRAINT FK_23CC8504EB71DAB7 FOREIGN KEY (payment_surcharge_fee) REFERENCES mollie_configuration_surcharge_fee (id)'); + $this->addSql('ALTER TABLE mollie_configuration ADD CONSTRAINT FK_23CC8504DBC26BFF FOREIGN KEY (method_image_id) REFERENCES mollie_method_image (id)'); + $this->addSql('ALTER TABLE mollie_configuration ADD CONSTRAINT FK_23CC8504577F8E00 FOREIGN KEY (gateway_id) REFERENCES sylius_gateway_config (id)'); + $this->addSql('ALTER TABLE mollie_subscription_first ADD CONSTRAINT FK_97993F5D8D9F6D38 FOREIGN KEY (order_id) REFERENCES sylius_order (id)'); } public function down(Schema $schema): void @@ -35,12 +35,12 @@ public function down(Schema $schema): void // this down() migration is auto-generated, please modify it to your needs $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration DROP FOREIGN KEY FK_23CC8504DBC26BFF'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration DROP FOREIGN KEY FK_23CC8504EB71DAB7'); - $this->addSql('DROP TABLE bitbag_mollie_configuration'); - $this->addSql('DROP TABLE bitbag_subscription'); - $this->addSql('DROP TABLE bitbag_mollie_method_image'); - $this->addSql('DROP TABLE bitbag_mollie_logger'); - $this->addSql('DROP TABLE bitbag_mollie_configuration_surcharge_fee'); + $this->addSql('ALTER TABLE mollie_configuration DROP FOREIGN KEY FK_23CC8504DBC26BFF'); + $this->addSql('ALTER TABLE mollie_configuration DROP FOREIGN KEY FK_23CC8504EB71DAB7'); + $this->addSql('DROP TABLE mollie_configuration'); + $this->addSql('DROP TABLE mollie_subscription_first'); + $this->addSql('DROP TABLE mollie_method_image'); + $this->addSql('DROP TABLE mollie_logger'); + $this->addSql('DROP TABLE mollie_configuration_surcharge_fee'); } } diff --git a/src/Migrations/Version20200824102938.php b/src/Migrations/Version20200824102938.php index acbbce10..3333dd9e 100644 --- a/src/Migrations/Version20200824102938.php +++ b/src/Migrations/Version20200824102938.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -19,7 +19,7 @@ public function up(Schema $schema): void // this up() migration is auto-generated, please modify it to your needs $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration ADD payment_description VARCHAR(255) DEFAULT NULL'); + $this->addSql('ALTER TABLE mollie_configuration ADD payment_description VARCHAR(255) DEFAULT NULL'); } public function down(Schema $schema): void @@ -27,6 +27,6 @@ public function down(Schema $schema): void // this down() migration is auto-generated, please modify it to your needs $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration DROP payment_description'); + $this->addSql('ALTER TABLE mollie_configuration DROP payment_description'); } } diff --git a/src/Migrations/Version20200825104739.php b/src/Migrations/Version20200825104739.php index 7371b121..1d871603 100644 --- a/src/Migrations/Version20200825104739.php +++ b/src/Migrations/Version20200825104739.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -19,9 +19,9 @@ public function up(Schema $schema): void // this up() migration is auto-generated, please modify it to your needs $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); - $this->addSql('CREATE TABLE bitbag_mollie_product_type (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_FCC472585E237E06 (name), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('CREATE TABLE mollie_product_type (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_FCC472585E237E06 (name), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); $this->addSql('ALTER TABLE sylius_product ADD product_type_id INT DEFAULT NULL'); - $this->addSql('ALTER TABLE sylius_product ADD CONSTRAINT FK_677B9B7414959723 FOREIGN KEY (product_type_id) REFERENCES bitbag_mollie_product_type (id) ON DELETE SET NULL'); + $this->addSql('ALTER TABLE sylius_product ADD CONSTRAINT FK_677B9B7414959723 FOREIGN KEY (product_type_id) REFERENCES mollie_product_type (id) ON DELETE SET NULL'); $this->addSql('CREATE INDEX IDX_677B9B7414959723 ON sylius_product (product_type_id)'); } @@ -31,7 +31,7 @@ public function down(Schema $schema): void $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); $this->addSql('ALTER TABLE sylius_product DROP FOREIGN KEY FK_677B9B7414959723'); - $this->addSql('DROP TABLE bitbag_mollie_product_type'); + $this->addSql('DROP TABLE mollie_product_type'); $this->addSql('DROP INDEX IDX_677B9B7414959723 ON sylius_product'); $this->addSql('ALTER TABLE sylius_product DROP product_type_id'); } diff --git a/src/Migrations/Version20200825151019.php b/src/Migrations/Version20200825151019.php index 866f030b..053b2934 100644 --- a/src/Migrations/Version20200825151019.php +++ b/src/Migrations/Version20200825151019.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -19,9 +19,9 @@ public function up(Schema $schema): void // this up() migration is auto-generated, please modify it to your needs $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration ADD default_category_id INT DEFAULT NULL'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration ADD CONSTRAINT FK_23CC85048298F FOREIGN KEY (default_category_id) REFERENCES bitbag_mollie_product_type (id)'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_23CC85048298F ON bitbag_mollie_configuration (default_category_id)'); + $this->addSql('ALTER TABLE mollie_configuration ADD default_category_id INT DEFAULT NULL'); + $this->addSql('ALTER TABLE mollie_configuration ADD CONSTRAINT FK_23CC85048298F FOREIGN KEY (default_category_id) REFERENCES mollie_product_type (id)'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_23CC85048298F ON mollie_configuration (default_category_id)'); } public function down(Schema $schema): void @@ -29,8 +29,8 @@ public function down(Schema $schema): void // this down() migration is auto-generated, please modify it to your needs $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration DROP FOREIGN KEY FK_23CC85048298F'); - $this->addSql('DROP INDEX UNIQ_23CC85048298F ON bitbag_mollie_configuration'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration DROP default_category_id'); + $this->addSql('ALTER TABLE mollie_configuration DROP FOREIGN KEY FK_23CC85048298F'); + $this->addSql('DROP INDEX UNIQ_23CC85048298F ON mollie_configuration'); + $this->addSql('ALTER TABLE mollie_configuration DROP default_category_id'); } } diff --git a/src/Migrations/Version20201006124816.php b/src/Migrations/Version20201006124816.php index 016d0ef8..31eafa7c 100644 --- a/src/Migrations/Version20201006124816.php +++ b/src/Migrations/Version20201006124816.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,7 +20,7 @@ public function up(Schema $schema): void $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); $this->addSql('ALTER TABLE sylius_order ADD abandoned_email TINYINT(1) NOT NULL'); - $this->addSql('ALTER TABLE bitbag_mollie_logger CHANGE message message VARCHAR(500) NOT NULL'); + $this->addSql('ALTER TABLE mollie_logger CHANGE message message VARCHAR(500) NOT NULL'); } public function down(Schema $schema): void @@ -28,7 +28,7 @@ public function down(Schema $schema): void // this down() migration is auto-generated, please modify it to your needs $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); - $this->addSql('ALTER TABLE bitbag_mollie_logger CHANGE message message VARCHAR(255) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`'); + $this->addSql('ALTER TABLE mollie_logger CHANGE message message VARCHAR(255) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`'); $this->addSql('ALTER TABLE sylius_order DROP abandoned_email'); } } diff --git a/src/Migrations/Version20201006130718.php b/src/Migrations/Version20201006130718.php index 37ed20e0..d5f7d5fb 100644 --- a/src/Migrations/Version20201006130718.php +++ b/src/Migrations/Version20201006130718.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -19,7 +19,7 @@ public function up(Schema $schema): void // this up() migration is auto-generated, please modify it to your needs $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration ADD country_restriction VARCHAR(255) DEFAULT NULL, ADD country_level_allowed LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', CHANGE country_level country_level_excluded LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\''); + $this->addSql('ALTER TABLE mollie_configuration ADD country_restriction VARCHAR(255) DEFAULT NULL, ADD country_level_allowed LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\', CHANGE country_level country_level_excluded LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:array)\''); } public function down(Schema $schema): void @@ -27,6 +27,6 @@ public function down(Schema $schema): void // this down() migration is auto-generated, please modify it to your needs $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration ADD country_level LONGTEXT CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci` COMMENT \'(DC2Type:array)\', DROP country_restriction, DROP country_level_excluded, DROP country_level_allowed'); + $this->addSql('ALTER TABLE mollie_configuration ADD country_level LONGTEXT CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci` COMMENT \'(DC2Type:array)\', DROP country_restriction, DROP country_level_excluded, DROP country_level_allowed'); } } diff --git a/src/Migrations/Version20201015151054.php b/src/Migrations/Version20201015151054.php index 67c04d14..ced66052 100644 --- a/src/Migrations/Version20201015151054.php +++ b/src/Migrations/Version20201015151054.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -19,7 +19,7 @@ public function up(Schema $schema): void // this up() migration is auto-generated, please modify it to your needs $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); - $this->addSql('CREATE TABLE bitbag_mollie_customer (id INT AUTO_INCREMENT NOT NULL, profile_id VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_162C0BF1CCFA12B8 (profile_id), UNIQUE INDEX UNIQ_162C0BF1E7927C74 (email), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('CREATE TABLE mollie_customer (id INT AUTO_INCREMENT NOT NULL, profile_id VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, UNIQUE INDEX UNIQ_162C0BF1CCFA12B8 (profile_id), UNIQUE INDEX UNIQ_162C0BF1E7927C74 (email), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); } public function down(Schema $schema): void @@ -27,6 +27,6 @@ public function down(Schema $schema): void // this down() migration is auto-generated, please modify it to your needs $this->abortIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\'.'); - $this->addSql('DROP TABLE bitbag_mollie_customer'); + $this->addSql('DROP TABLE mollie_customer'); } } diff --git a/src/Migrations/Version20201021101147.php b/src/Migrations/Version20201021101147.php index 2a7581d6..f460f3f6 100644 --- a/src/Migrations/Version20201021101147.php +++ b/src/Migrations/Version20201021101147.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -17,16 +17,16 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE TABLE bitbag_mollie_email_template (id INT AUTO_INCREMENT NOT NULL, type VARCHAR(255) NOT NULL, style TEXT DEFAULT NULL, UNIQUE INDEX UNIQ_835AAD848CDE5729 (type), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE bitbag_mollie_email_template_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) DEFAULT NULL, subject VARCHAR(255) DEFAULT NULL, content TEXT DEFAULT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_42127E4A2C2AC5D3 (translatable_id), UNIQUE INDEX bitbag_mollie_email_template_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('ALTER TABLE bitbag_mollie_email_template_translation ADD CONSTRAINT FK_42127E4A2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES bitbag_mollie_email_template (id) ON DELETE CASCADE'); + $this->addSql('CREATE TABLE mollie_email_template (id INT AUTO_INCREMENT NOT NULL, type VARCHAR(255) NOT NULL, style TEXT DEFAULT NULL, UNIQUE INDEX UNIQ_835AAD848CDE5729 (type), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('CREATE TABLE mollie_email_template_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) DEFAULT NULL, subject VARCHAR(255) DEFAULT NULL, content TEXT DEFAULT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_42127E4A2C2AC5D3 (translatable_id), UNIQUE INDEX mollie_email_template_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('ALTER TABLE mollie_email_template_translation ADD CONSTRAINT FK_42127E4A2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES mollie_email_template (id) ON DELETE CASCADE'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_email_template_translation DROP FOREIGN KEY FK_42127E4A2C2AC5D3'); - $this->addSql('DROP TABLE bitbag_mollie_email_template'); - $this->addSql('DROP TABLE bitbag_mollie_email_template_translation'); + $this->addSql('ALTER TABLE mollie_email_template_translation DROP FOREIGN KEY FK_42127E4A2C2AC5D3'); + $this->addSql('DROP TABLE mollie_email_template'); + $this->addSql('DROP TABLE mollie_email_template_translation'); } } diff --git a/src/Migrations/Version20210224130423.php b/src/Migrations/Version20210224130423.php index e5ec76b2..5bf5c613 100644 --- a/src/Migrations/Version20210224130423.php +++ b/src/Migrations/Version20210224130423.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,12 +20,12 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_configuration ADD apple_pay_direct TINYINT(1) NOT NULL'); + $this->addSql('ALTER TABLE mollie_configuration ADD apple_pay_direct TINYINT(1) NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_configuration DROP apple_pay_direct'); + $this->addSql('ALTER TABLE mollie_configuration DROP apple_pay_direct'); } } diff --git a/src/Migrations/Version20210302154654.php b/src/Migrations/Version20210302154654.php index 39b557e3..55236d38 100644 --- a/src/Migrations/Version20210302154654.php +++ b/src/Migrations/Version20210302154654.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,14 +20,14 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('DROP INDEX UNIQ_23CC85045E237E06 ON bitbag_mollie_configuration'); - $this->addSql('ALTER TABLE bitbag_mollie_logger CHANGE message message VARCHAR(1000) NOT NULL'); + $this->addSql('DROP INDEX UNIQ_23CC85045E237E06 ON mollie_configuration'); + $this->addSql('ALTER TABLE mollie_logger CHANGE message message VARCHAR(1000) NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE UNIQUE INDEX UNIQ_23CC85045E237E06 ON bitbag_mollie_configuration (name)'); - $this->addSql('ALTER TABLE bitbag_mollie_logger CHANGE message message VARCHAR(500) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_23CC85045E237E06 ON mollie_configuration (name)'); + $this->addSql('ALTER TABLE mollie_logger CHANGE message message VARCHAR(500) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`'); } } diff --git a/src/Migrations/Version20210326134353.php b/src/Migrations/Version20210326134353.php index 9d3a5014..05930ec1 100644 --- a/src/Migrations/Version20210326134353.php +++ b/src/Migrations/Version20210326134353.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/src/Migrations/Version20210326144153.php b/src/Migrations/Version20210326144153.php index 13a48c54..30e642c8 100644 --- a/src/Migrations/Version20210326144153.php +++ b/src/Migrations/Version20210326144153.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,12 +20,12 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_configuration ADD position INT NOT NULL'); + $this->addSql('ALTER TABLE mollie_configuration ADD position INT NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_configuration DROP position'); + $this->addSql('ALTER TABLE mollie_configuration DROP position'); } } diff --git a/src/Migrations/Version20210923142201.php b/src/Migrations/Version20210923142201.php index 645e291a..1025b0e4 100644 --- a/src/Migrations/Version20210923142201.php +++ b/src/Migrations/Version20210923142201.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,13 +20,13 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE TABLE bitbag_mollie_configuration_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) DEFAULT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_369B057A2C2AC5D3 (translatable_id), UNIQUE INDEX bitbag_mollie_configuration_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('ALTER TABLE bitbag_mollie_configuration_translation ADD CONSTRAINT FK_369B057A2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES bitbag_mollie_configuration (id) ON DELETE CASCADE'); + $this->addSql('CREATE TABLE mollie_configuration_translation (id INT AUTO_INCREMENT NOT NULL, translatable_id INT NOT NULL, name VARCHAR(255) DEFAULT NULL, locale VARCHAR(255) NOT NULL, INDEX IDX_369B057A2C2AC5D3 (translatable_id), UNIQUE INDEX mollie_configuration_translation_uniq_trans (translatable_id, locale), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('ALTER TABLE mollie_configuration_translation ADD CONSTRAINT FK_369B057A2C2AC5D3 FOREIGN KEY (translatable_id) REFERENCES mollie_configuration (id) ON DELETE CASCADE'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP TABLE bitbag_mollie_configuration_translation'); + $this->addSql('DROP TABLE mollie_configuration_translation'); } } diff --git a/src/Migrations/Version20211202141347.php b/src/Migrations/Version20211202141347.php index 7dd0de64..0ca78668 100644 --- a/src/Migrations/Version20211202141347.php +++ b/src/Migrations/Version20211202141347.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,23 +20,23 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE TABLE bitbag_mollie_subscription (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, `interval` INT NOT NULL, created_at DATETIME NOT NULL, started_at DATETIME DEFAULT NULL, INDEX IDX_5E346303A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE bitbag_mollie_subscription_payments (subscription_id INT NOT NULL, payment_id INT NOT NULL, INDEX IDX_4653AD099A1887DC (subscription_id), INDEX IDX_4653AD094C3A3BB (payment_id), PRIMARY KEY(subscription_id, payment_id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('CREATE TABLE bitbag_mollie_subscription_product (id INT AUTO_INCREMENT NOT NULL, subscription_id INT DEFAULT NULL, product_id INT DEFAULT NULL, product_amount INT NOT NULL, INDEX IDX_8B1B805A9A1887DC (subscription_id), INDEX IDX_8B1B805A4584665A (product_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD CONSTRAINT FK_5E346303A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_shop_user (id)'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription_payments ADD CONSTRAINT FK_4653AD099A1887DC FOREIGN KEY (subscription_id) REFERENCES bitbag_mollie_subscription (id)'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription_payments ADD CONSTRAINT FK_4653AD094C3A3BB FOREIGN KEY (payment_id) REFERENCES sylius_payment (id)'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription_product ADD CONSTRAINT FK_8B1B805A9A1887DC FOREIGN KEY (subscription_id) REFERENCES bitbag_mollie_subscription (id) ON DELETE CASCADE'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription_product ADD CONSTRAINT FK_8B1B805A4584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id)'); + $this->addSql('CREATE TABLE mollie_subscription (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, state VARCHAR(255) NOT NULL, `interval` INT NOT NULL, created_at DATETIME NOT NULL, started_at DATETIME DEFAULT NULL, INDEX IDX_5E346303A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('CREATE TABLE mollie_subscription_payments (subscription_id INT NOT NULL, payment_id INT NOT NULL, INDEX IDX_4653AD099A1887DC (subscription_id), INDEX IDX_4653AD094C3A3BB (payment_id), PRIMARY KEY(subscription_id, payment_id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('CREATE TABLE mollie_subscription_product (id INT AUTO_INCREMENT NOT NULL, subscription_id INT DEFAULT NULL, product_id INT DEFAULT NULL, product_amount INT NOT NULL, INDEX IDX_8B1B805A9A1887DC (subscription_id), INDEX IDX_8B1B805A4584665A (product_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('ALTER TABLE mollie_subscription ADD CONSTRAINT FK_5E346303A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_shop_user (id)'); + $this->addSql('ALTER TABLE mollie_subscription_payments ADD CONSTRAINT FK_4653AD099A1887DC FOREIGN KEY (subscription_id) REFERENCES mollie_subscription (id)'); + $this->addSql('ALTER TABLE mollie_subscription_payments ADD CONSTRAINT FK_4653AD094C3A3BB FOREIGN KEY (payment_id) REFERENCES sylius_payment (id)'); + $this->addSql('ALTER TABLE mollie_subscription_product ADD CONSTRAINT FK_8B1B805A9A1887DC FOREIGN KEY (subscription_id) REFERENCES mollie_subscription (id) ON DELETE CASCADE'); + $this->addSql('ALTER TABLE mollie_subscription_product ADD CONSTRAINT FK_8B1B805A4584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id)'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription_payments DROP FOREIGN KEY FK_4653AD099A1887DC'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription_product DROP FOREIGN KEY FK_8B1B805A9A1887DC'); - $this->addSql('DROP TABLE bitbag_mollie_subscription'); - $this->addSql('DROP TABLE bitbag_mollie_subscription_payments'); - $this->addSql('DROP TABLE bitbag_mollie_subscription_product'); + $this->addSql('ALTER TABLE mollie_subscription_payments DROP FOREIGN KEY FK_4653AD099A1887DC'); + $this->addSql('ALTER TABLE mollie_subscription_product DROP FOREIGN KEY FK_8B1B805A9A1887DC'); + $this->addSql('DROP TABLE mollie_subscription'); + $this->addSql('DROP TABLE mollie_subscription_payments'); + $this->addSql('DROP TABLE mollie_subscription_product'); } } diff --git a/src/Migrations/Version20211202141352.php b/src/Migrations/Version20211202141352.php index 6aea5471..af4d3cab 100644 --- a/src/Migrations/Version20211202141352.php +++ b/src/Migrations/Version20211202141352.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,12 +20,12 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD subscription_id VARCHAR(255) DEFAULT NULL, ADD customer_id VARCHAR(255) DEFAULT NULL'); + $this->addSql('ALTER TABLE mollie_subscription ADD subscription_id VARCHAR(255) DEFAULT NULL, ADD customer_id VARCHAR(255) DEFAULT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription DROP subscription_id, DROP customer_id'); + $this->addSql('ALTER TABLE mollie_subscription DROP subscription_id, DROP customer_id'); } } diff --git a/src/Migrations/Version20211220145158.php b/src/Migrations/Version20211220145158.php index 67980c4a..1d49276b 100644 --- a/src/Migrations/Version20211220145158.php +++ b/src/Migrations/Version20211220145158.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -21,7 +21,7 @@ public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs $this->addSql('ALTER TABLE sylius_order ADD subscription_id INT DEFAULT NULL, ADD recurring_sequence_index INT DEFAULT NULL'); - $this->addSql('ALTER TABLE sylius_order ADD CONSTRAINT FK_6196A1F99A1887DC FOREIGN KEY (subscription_id) REFERENCES bitbag_mollie_subscription (id) ON DELETE RESTRICT'); + $this->addSql('ALTER TABLE sylius_order ADD CONSTRAINT FK_6196A1F99A1887DC FOREIGN KEY (subscription_id) REFERENCES mollie_subscription (id) ON DELETE RESTRICT'); $this->addSql('CREATE INDEX IDX_6196A1F99A1887DC ON sylius_order (subscription_id)'); } diff --git a/src/Migrations/Version20220111135524.php b/src/Migrations/Version20220111135524.php index 07579244..503a807f 100644 --- a/src/Migrations/Version20220111135524.php +++ b/src/Migrations/Version20220111135524.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/src/Migrations/Version20220111145014.php b/src/Migrations/Version20220111145014.php index adad993f..e3a8f092 100644 --- a/src/Migrations/Version20220111145014.php +++ b/src/Migrations/Version20220111145014.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,22 +20,22 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('DROP TABLE bitbag_mollie_subscription_product'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription DROP FOREIGN KEY FK_5E346303A76ED395'); - $this->addSql('DROP INDEX IDX_5E346303A76ED395 ON bitbag_mollie_subscription'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription DROP user_id'); - $this->addSql('CREATE INDEX IDX_5E3463039395C3F3 ON bitbag_mollie_subscription (customer_id)'); + $this->addSql('DROP TABLE mollie_subscription_product'); + $this->addSql('ALTER TABLE mollie_subscription DROP FOREIGN KEY FK_5E346303A76ED395'); + $this->addSql('DROP INDEX IDX_5E346303A76ED395 ON mollie_subscription'); + $this->addSql('ALTER TABLE mollie_subscription DROP user_id'); + $this->addSql('CREATE INDEX IDX_5E3463039395C3F3 ON mollie_subscription (customer_id)'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE TABLE bitbag_mollie_subscription_product (id INT AUTO_INCREMENT NOT NULL, subscription_id INT DEFAULT NULL, product_id INT DEFAULT NULL, product_amount INT NOT NULL, INDEX IDX_8B1B805A4584665A (product_id), INDEX IDX_8B1B805A9A1887DC (subscription_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB COMMENT = \'\' '); - $this->addSql('ALTER TABLE bitbag_mollie_subscription_product ADD CONSTRAINT FK_8B1B805A4584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id)'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription_product ADD CONSTRAINT FK_8B1B805A9A1887DC FOREIGN KEY (subscription_id) REFERENCES bitbag_mollie_subscription (id) ON DELETE CASCADE'); - $this->addSql('DROP INDEX IDX_5E3463039395C3F3 ON bitbag_mollie_subscription'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD user_id INT DEFAULT NULL'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD CONSTRAINT FK_5E346303A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_shop_user (id)'); - $this->addSql('CREATE INDEX IDX_5E346303A76ED395 ON bitbag_mollie_subscription (user_id)'); + $this->addSql('CREATE TABLE mollie_subscription_product (id INT AUTO_INCREMENT NOT NULL, subscription_id INT DEFAULT NULL, product_id INT DEFAULT NULL, product_amount INT NOT NULL, INDEX IDX_8B1B805A4584665A (product_id), INDEX IDX_8B1B805A9A1887DC (subscription_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB COMMENT = \'\' '); + $this->addSql('ALTER TABLE mollie_subscription_product ADD CONSTRAINT FK_8B1B805A4584665A FOREIGN KEY (product_id) REFERENCES sylius_product (id)'); + $this->addSql('ALTER TABLE mollie_subscription_product ADD CONSTRAINT FK_8B1B805A9A1887DC FOREIGN KEY (subscription_id) REFERENCES mollie_subscription (id) ON DELETE CASCADE'); + $this->addSql('DROP INDEX IDX_5E3463039395C3F3 ON mollie_subscription'); + $this->addSql('ALTER TABLE mollie_subscription ADD user_id INT DEFAULT NULL'); + $this->addSql('ALTER TABLE mollie_subscription ADD CONSTRAINT FK_5E346303A76ED395 FOREIGN KEY (user_id) REFERENCES sylius_shop_user (id)'); + $this->addSql('CREATE INDEX IDX_5E346303A76ED395 ON mollie_subscription (user_id)'); } } diff --git a/src/Migrations/Version20220112100407.php b/src/Migrations/Version20220112100407.php index c16bc3a1..283b050e 100644 --- a/src/Migrations/Version20220112100407.php +++ b/src/Migrations/Version20220112100407.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,12 +20,12 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription CHANGE `interval` `interval` VARCHAR(255) NOT NULL'); + $this->addSql('ALTER TABLE mollie_subscription CHANGE `interval` `interval` VARCHAR(255) NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription CHANGE `interval` `interval` INT NOT NULL'); + $this->addSql('ALTER TABLE mollie_subscription CHANGE `interval` `interval` INT NOT NULL'); } } diff --git a/src/Migrations/Version20220112100741.php b/src/Migrations/Version20220112100741.php index 1dd7098c..acc8d969 100644 --- a/src/Migrations/Version20220112100741.php +++ b/src/Migrations/Version20220112100741.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,14 +20,14 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD mollie_customer_id VARCHAR(255) DEFAULT NULL, CHANGE customer_id customer_id INT DEFAULT NULL'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD CONSTRAINT FK_5E3463039395C3F3 FOREIGN KEY (customer_id) REFERENCES sylius_customer (id)'); + $this->addSql('ALTER TABLE mollie_subscription ADD mollie_customer_id VARCHAR(255) DEFAULT NULL, CHANGE customer_id customer_id INT DEFAULT NULL'); + $this->addSql('ALTER TABLE mollie_subscription ADD CONSTRAINT FK_5E3463039395C3F3 FOREIGN KEY (customer_id) REFERENCES sylius_customer (id)'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription DROP FOREIGN KEY FK_5E3463039395C3F3'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription DROP mollie_customer_id, CHANGE customer_id customer_id VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci`'); + $this->addSql('ALTER TABLE mollie_subscription DROP FOREIGN KEY FK_5E3463039395C3F3'); + $this->addSql('ALTER TABLE mollie_subscription DROP mollie_customer_id, CHANGE customer_id customer_id VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci`'); } } diff --git a/src/Migrations/Version20220112141412.php b/src/Migrations/Version20220112141412.php index be31ee79..0cf351b8 100644 --- a/src/Migrations/Version20220112141412.php +++ b/src/Migrations/Version20220112141412.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,12 +20,12 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD number_of_repetitions INT NOT NULL'); + $this->addSql('ALTER TABLE mollie_subscription ADD number_of_repetitions INT NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription DROP number_of_repetitions'); + $this->addSql('ALTER TABLE mollie_subscription DROP number_of_repetitions'); } } diff --git a/src/Migrations/Version20220112141532.php b/src/Migrations/Version20220112141532.php index e1315da0..7af250bd 100644 --- a/src/Migrations/Version20220112141532.php +++ b/src/Migrations/Version20220112141532.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,14 +20,14 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE TABLE bitbag_mollie_subscription_orders (subscription_id INT NOT NULL, order_id INT NOT NULL, INDEX IDX_DCE71BD39A1887DC (subscription_id), INDEX IDX_DCE71BD38D9F6D38 (order_id), PRIMARY KEY(subscription_id, order_id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription_orders ADD CONSTRAINT FK_DCE71BD39A1887DC FOREIGN KEY (subscription_id) REFERENCES bitbag_mollie_subscription (id)'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription_orders ADD CONSTRAINT FK_DCE71BD38D9F6D38 FOREIGN KEY (order_id) REFERENCES sylius_order (id)'); + $this->addSql('CREATE TABLE mollie_subscription_orders (subscription_id INT NOT NULL, order_id INT NOT NULL, INDEX IDX_DCE71BD39A1887DC (subscription_id), INDEX IDX_DCE71BD38D9F6D38 (order_id), PRIMARY KEY(subscription_id, order_id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('ALTER TABLE mollie_subscription_orders ADD CONSTRAINT FK_DCE71BD39A1887DC FOREIGN KEY (subscription_id) REFERENCES mollie_subscription (id)'); + $this->addSql('ALTER TABLE mollie_subscription_orders ADD CONSTRAINT FK_DCE71BD38D9F6D38 FOREIGN KEY (order_id) REFERENCES sylius_order (id)'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP TABLE bitbag_mollie_subscription_orders'); + $this->addSql('DROP TABLE mollie_subscription_orders'); } } diff --git a/src/Migrations/Version20220113104905.php b/src/Migrations/Version20220113104905.php index 0a581de5..aeda6013 100644 --- a/src/Migrations/Version20220113104905.php +++ b/src/Migrations/Version20220113104905.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,16 +20,16 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD order_item_id INT DEFAULT NULL'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD CONSTRAINT FK_5E346303E415FB15 FOREIGN KEY (order_item_id) REFERENCES sylius_order_item (id)'); - $this->addSql('CREATE INDEX IDX_5E346303E415FB15 ON bitbag_mollie_subscription (order_item_id)'); + $this->addSql('ALTER TABLE mollie_subscription ADD order_item_id INT DEFAULT NULL'); + $this->addSql('ALTER TABLE mollie_subscription ADD CONSTRAINT FK_5E346303E415FB15 FOREIGN KEY (order_item_id) REFERENCES sylius_order_item (id)'); + $this->addSql('CREATE INDEX IDX_5E346303E415FB15 ON mollie_subscription (order_item_id)'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription DROP FOREIGN KEY FK_5E346303E415FB15'); - $this->addSql('DROP INDEX IDX_5E346303E415FB15 ON bitbag_mollie_subscription'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription DROP order_item_id'); + $this->addSql('ALTER TABLE mollie_subscription DROP FOREIGN KEY FK_5E346303E415FB15'); + $this->addSql('DROP INDEX IDX_5E346303E415FB15 ON mollie_subscription'); + $this->addSql('ALTER TABLE mollie_subscription DROP order_item_id'); } } diff --git a/src/Migrations/Version20220113140312.php b/src/Migrations/Version20220113140312.php index 1f679853..3ff2734c 100644 --- a/src/Migrations/Version20220113140312.php +++ b/src/Migrations/Version20220113140312.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,12 +20,12 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD mandate_id VARCHAR(255) DEFAULT NULL'); + $this->addSql('ALTER TABLE mollie_subscription ADD mandate_id VARCHAR(255) DEFAULT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription DROP mandate_id'); + $this->addSql('ALTER TABLE mollie_subscription DROP mandate_id'); } } diff --git a/src/Migrations/Version20220113152104.php b/src/Migrations/Version20220113152104.php index ec8d56ca..36a9964e 100644 --- a/src/Migrations/Version20220113152104.php +++ b/src/Migrations/Version20220113152104.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,13 +20,13 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE TABLE bitbag_mollie_subscription_schedule (id INT AUTO_INCREMENT NOT NULL, mollie_subscription_id INT DEFAULT NULL, scheduled_date DATETIME NOT NULL, fulfilled_date DATETIME DEFAULT NULL, INDEX IDX_79B927C0D38231D4 (mollie_subscription_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription_schedule ADD CONSTRAINT FK_79B927C0D38231D4 FOREIGN KEY (mollie_subscription_id) REFERENCES bitbag_mollie_subscription (id)'); + $this->addSql('CREATE TABLE mollie_subscription_schedule (id INT AUTO_INCREMENT NOT NULL, mollie_subscription_id INT DEFAULT NULL, scheduled_date DATETIME NOT NULL, fulfilled_date DATETIME DEFAULT NULL, INDEX IDX_79B927C0D38231D4 (mollie_subscription_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('ALTER TABLE mollie_subscription_schedule ADD CONSTRAINT FK_79B927C0D38231D4 FOREIGN KEY (mollie_subscription_id) REFERENCES mollie_subscription (id)'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('DROP TABLE bitbag_mollie_subscription_schedule'); + $this->addSql('DROP TABLE mollie_subscription_schedule'); } } diff --git a/src/Migrations/Version20220113153514.php b/src/Migrations/Version20220113153514.php index 9f6b4e7a..ccb97df8 100644 --- a/src/Migrations/Version20220113153514.php +++ b/src/Migrations/Version20220113153514.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,12 +20,12 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription_schedule ADD schedule_index INT NOT NULL'); + $this->addSql('ALTER TABLE mollie_subscription_schedule ADD schedule_index INT NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription_schedule DROP schedule_index'); + $this->addSql('ALTER TABLE mollie_subscription_schedule DROP schedule_index'); } } diff --git a/src/Migrations/Version20220113182105.php b/src/Migrations/Version20220113182105.php index 81872f36..9d70bc43 100644 --- a/src/Migrations/Version20220113182105.php +++ b/src/Migrations/Version20220113182105.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,12 +20,12 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD processing_state VARCHAR(255) DEFAULT \'none\' NOT NULL'); + $this->addSql('ALTER TABLE mollie_subscription ADD processing_state VARCHAR(255) DEFAULT \'none\' NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription DROP processing_state'); + $this->addSql('ALTER TABLE mollie_subscription DROP processing_state'); } } diff --git a/src/Migrations/Version20220201103505.php b/src/Migrations/Version20220201103505.php index fbbf4f26..2b1a9d96 100644 --- a/src/Migrations/Version20220201103505.php +++ b/src/Migrations/Version20220201103505.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,12 +20,12 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD payment_details_configuration LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\''); + $this->addSql('ALTER TABLE mollie_subscription ADD payment_details_configuration LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\''); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription DROP payment_details_configuration'); + $this->addSql('ALTER TABLE mollie_subscription DROP payment_details_configuration'); } } diff --git a/src/Migrations/Version20220201213037.php b/src/Migrations/Version20220201213037.php index cffdecb0..46fb9475 100644 --- a/src/Migrations/Version20220201213037.php +++ b/src/Migrations/Version20220201213037.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,21 +20,21 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('CREATE TABLE bitbag_mollie_subscription_configuration (id INT AUTO_INCREMENT NOT NULL, host_name VARCHAR(255) NOT NULL, port INT DEFAULT NULL, subscription_id VARCHAR(255) DEFAULT NULL, mandate_id VARCHAR(255) DEFAULT NULL, mollie_customer_id VARCHAR(255) DEFAULT NULL, number_of_repetitions INT NOT NULL, payment_details_configuration LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); - $this->addSql('DROP TABLE bitbag_subscription'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD subscription_configuration_id INT DEFAULT NULL, ADD recent_failed_payments_count INT DEFAULT 0 NOT NULL, ADD payment_state VARCHAR(255) DEFAULT \'pending\' NOT NULL, DROP `interval`, DROP subscription_id, DROP mollie_customer_id, DROP number_of_repetitions, DROP mandate_id, DROP payment_details_configuration'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD CONSTRAINT FK_5E346303B3185C FOREIGN KEY (subscription_configuration_id) REFERENCES bitbag_mollie_subscription_configuration (id)'); - $this->addSql('CREATE UNIQUE INDEX UNIQ_5E346303B3185C ON bitbag_mollie_subscription (subscription_configuration_id)'); + $this->addSql('CREATE TABLE mollie_subscription_configuration (id INT AUTO_INCREMENT NOT NULL, host_name VARCHAR(255) NOT NULL, port INT DEFAULT NULL, subscription_id VARCHAR(255) DEFAULT NULL, mandate_id VARCHAR(255) DEFAULT NULL, mollie_customer_id VARCHAR(255) DEFAULT NULL, number_of_repetitions INT NOT NULL, payment_details_configuration LONGTEXT NOT NULL COMMENT \'(DC2Type:array)\', PRIMARY KEY(id)) DEFAULT CHARACTER SET UTF8 COLLATE `UTF8_unicode_ci` ENGINE = InnoDB'); + $this->addSql('DROP TABLE mollie_subscription_first'); + $this->addSql('ALTER TABLE mollie_subscription ADD subscription_configuration_id INT DEFAULT NULL, ADD recent_failed_payments_count INT DEFAULT 0 NOT NULL, ADD payment_state VARCHAR(255) DEFAULT \'pending\' NOT NULL, DROP `interval`, DROP subscription_id, DROP mollie_customer_id, DROP number_of_repetitions, DROP mandate_id, DROP payment_details_configuration'); + $this->addSql('ALTER TABLE mollie_subscription ADD CONSTRAINT FK_5E346303B3185C FOREIGN KEY (subscription_configuration_id) REFERENCES mollie_subscription_configuration (id)'); + $this->addSql('CREATE UNIQUE INDEX UNIQ_5E346303B3185C ON mollie_subscription (subscription_configuration_id)'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription DROP FOREIGN KEY FK_5E346303B3185C'); - $this->addSql('CREATE TABLE bitbag_subscription (id INT AUTO_INCREMENT NOT NULL, order_id INT DEFAULT NULL, subscription_id VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci`, customer_id VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci`, state VARCHAR(255) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`, UNIQUE INDEX UNIQ_97993F5D9395C3F3 (customer_id), UNIQUE INDEX UNIQ_97993F5D9A1887DC (subscription_id), UNIQUE INDEX UNIQ_97993F5D8D9F6D38 (order_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB COMMENT = \'\' '); - $this->addSql('ALTER TABLE bitbag_subscription ADD CONSTRAINT FK_97993F5D8D9F6D38 FOREIGN KEY (order_id) REFERENCES sylius_order (id) ON DELETE CASCADE'); - $this->addSql('DROP TABLE bitbag_mollie_subscription_configuration'); - $this->addSql('DROP INDEX UNIQ_5E346303B3185C ON bitbag_mollie_subscription'); - $this->addSql('ALTER TABLE bitbag_mollie_subscription ADD `interval` VARCHAR(255) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`, ADD subscription_id VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci`, ADD mollie_customer_id VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci`, ADD number_of_repetitions INT NOT NULL, ADD mandate_id VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci`, ADD payment_details_configuration LONGTEXT CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci` COMMENT \'(DC2Type:array)\', DROP subscription_configuration_id, DROP recent_failed_payments_count, DROP payment_state'); + $this->addSql('ALTER TABLE mollie_subscription DROP FOREIGN KEY FK_5E346303B3185C'); + $this->addSql('CREATE TABLE mollie_subscription_first (id INT AUTO_INCREMENT NOT NULL, order_id INT DEFAULT NULL, subscription_id VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci`, customer_id VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci`, state VARCHAR(255) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`, UNIQUE INDEX UNIQ_97993F5D9395C3F3 (customer_id), UNIQUE INDEX UNIQ_97993F5D9A1887DC (subscription_id), UNIQUE INDEX UNIQ_97993F5D8D9F6D38 (order_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE `utf8_unicode_ci` ENGINE = InnoDB COMMENT = \'\' '); + $this->addSql('ALTER TABLE mollie_subscription_first ADD CONSTRAINT FK_97993F5D8D9F6D38 FOREIGN KEY (order_id) REFERENCES sylius_order (id) ON DELETE CASCADE'); + $this->addSql('DROP TABLE mollie_subscription_configuration'); + $this->addSql('DROP INDEX UNIQ_5E346303B3185C ON mollie_subscription'); + $this->addSql('ALTER TABLE mollie_subscription ADD `interval` VARCHAR(255) CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci`, ADD subscription_id VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci`, ADD mollie_customer_id VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci`, ADD number_of_repetitions INT NOT NULL, ADD mandate_id VARCHAR(255) CHARACTER SET utf8 DEFAULT NULL COLLATE `utf8_unicode_ci`, ADD payment_details_configuration LONGTEXT CHARACTER SET utf8 NOT NULL COLLATE `utf8_unicode_ci` COMMENT \'(DC2Type:array)\', DROP subscription_configuration_id, DROP recent_failed_payments_count, DROP payment_state'); } } diff --git a/src/Migrations/Version20220201213642.php b/src/Migrations/Version20220201213642.php index 55c40bac..fb47e20a 100644 --- a/src/Migrations/Version20220201213642.php +++ b/src/Migrations/Version20220201213642.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -20,12 +20,12 @@ public function getDescription(): string public function up(Schema $schema): void { // this up() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription_configuration ADD `interval` VARCHAR(255) NOT NULL'); + $this->addSql('ALTER TABLE mollie_subscription_configuration ADD `interval` VARCHAR(255) NOT NULL'); } public function down(Schema $schema): void { // this down() migration is auto-generated, please modify it to your needs - $this->addSql('ALTER TABLE bitbag_mollie_subscription_configuration DROP `interval`'); + $this->addSql('ALTER TABLE mollie_subscription_configuration DROP `interval`'); } } diff --git a/src/Migrations/Version20220211040328.php b/src/Migrations/Version20220211040328.php index ae45d1ba..45265942 100644 --- a/src/Migrations/Version20220211040328.php +++ b/src/Migrations/Version20220211040328.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Migrations; +namespace SyliusMolliePlugin\Migrations; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/src/Options/Country/Options.php b/src/Options/Country/Options.php index 508b8493..bf6ec1cf 100644 --- a/src/Options/Country/Options.php +++ b/src/Options/Country/Options.php @@ -1,23 +1,17 @@ payum = $payum; - $this->session = $session; } /** diff --git a/src/PaymentProcessing/CancelRecurringSubscriptionProcessorInterface.php b/src/PaymentProcessing/CancelRecurringSubscriptionProcessorInterface.php index 45833c55..06fa1290 100644 --- a/src/PaymentProcessing/CancelRecurringSubscriptionProcessorInterface.php +++ b/src/PaymentProcessing/CancelRecurringSubscriptionProcessorInterface.php @@ -1,17 +1,11 @@ cartContext->getCart(); + try { + $order = $this->cartContext->getCart(); + } catch (\Symfony\Component\HttpFoundation\Exception\SessionNotFoundException $e) { + $order = null; + } } if (true === $order instanceof OrderInterface && true === $order->hasRecurringContents()) { diff --git a/src/Resolver/MollieFactoryNameResolverInterface.php b/src/Resolver/MollieFactoryNameResolverInterface.php index b9ad5d60..e46beac0 100644 --- a/src/Resolver/MollieFactoryNameResolverInterface.php +++ b/src/Resolver/MollieFactoryNameResolverInterface.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace BitBag\SyliusMolliePlugin\Resolver; +namespace SyliusMolliePlugin\Resolver; -use BitBag\SyliusMolliePlugin\Entity\OrderInterface; +use SyliusMolliePlugin\Entity\OrderInterface; interface MollieFactoryNameResolverInterface { diff --git a/src/Resolver/MollieMethodsResolver.php b/src/Resolver/MollieMethodsResolver.php index 5183fd5c..716cb7f3 100644 --- a/src/Resolver/MollieMethodsResolver.php +++ b/src/Resolver/MollieMethodsResolver.php @@ -1,23 +1,17 @@ response.json()) .then((data) => { - const paymentFeeRow = $('#bitbag-paymentFee-row'); + const paymentFeeRow = $('#mollie-paymentFee-row'); if (paymentFeeRow.length && data.view) { paymentFeeRow.replaceWith(data.view); @@ -50,7 +50,7 @@ $(function () { } function restoreOrderTotalValue() { - $('#bitbag-paymentFee-row').replaceWith(''); + $('#mollie-paymentFee-row').replaceWith(''); orderTotalRow.text(initialOrderTotal); } diff --git a/src/Resources/assets/shop/js/mollie/applePayDirect.js b/src/Resources/assets/shop/js/mollie/applePayDirect.js index a3c53eb1..7b6d8610 100644 --- a/src/Resources/assets/shop/js/mollie/applePayDirect.js +++ b/src/Resources/assets/shop/js/mollie/applePayDirect.js @@ -7,34 +7,34 @@ $(function () { 'mollie_applepay_button' ); - const bitbagMollieValidateMerchantUrl = + const mollieValidateMerchantUrl = applePayButton.getAttribute('data-url-validate'); - const bitbagMolliePaymentUrl = + const molliePaymentUrl = applePayButton.getAttribute('data-url-payment'); - const bitbagMollieCurrency = applePayButton.getAttribute( + const mollieCurrency = applePayButton.getAttribute( 'data-currency-order' ); - const bitbagMollieMerchantName = + const mollieMerchantName = applePayButton.getAttribute('data-merchant-name'); - let bitbagMollieTotalOrder = + let mollieTotalOrder = applePayButton.getAttribute('data-total-order'); - bitbagMollieTotalOrder = bitbagMollieTotalOrder / divider; - bitbagMollieTotalOrder = bitbagMollieTotalOrder.toString(); + mollieTotalOrder = mollieTotalOrder / divider; + mollieTotalOrder = mollieTotalOrder.toString(); const session = new ApplePaySession( version, request( 'US', - bitbagMollieCurrency, - bitbagMollieMerchantName, - bitbagMollieTotalOrder + mollieCurrency, + mollieMerchantName, + mollieTotalOrder ) ); session.onvalidatemerchant = (applePayValidateMerchantEvent) => { jQuery.ajax({ - url: bitbagMollieValidateMerchantUrl, + url: mollieValidateMerchantUrl, method: 'POST', data: { validationUrl: applePayValidateMerchantEvent.validationURL, @@ -56,7 +56,7 @@ $(function () { session.onpaymentauthorized = (ApplePayPayment) => { jQuery.ajax({ - url: bitbagMolliePaymentUrl, + url: molliePaymentUrl, method: 'POST', data: { token: ApplePayPayment.payment.token, diff --git a/src/Resources/assets/shop/scss/style.scss b/src/Resources/assets/shop/scss/style.scss index 7d697878..d0c998bd 100644 --- a/src/Resources/assets/shop/scss/style.scss +++ b/src/Resources/assets/shop/scss/style.scss @@ -59,11 +59,11 @@ } .online-payment__label { - display: flex; + display: flex!important; flex-direction: column; align-items: center; border: 1px solid #dedede; - padding: 1rem; + padding: 1rem!important; border-radius: 5px; cursor: pointer; font-weight: bold; diff --git a/src/Resources/config/config.yaml b/src/Resources/config/config.yaml index 4e881765..bd5acfb7 100644 --- a/src/Resources/config/config.yaml +++ b/src/Resources/config/config.yaml @@ -1,11 +1,11 @@ imports: - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/services.xml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/resources.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/state_machine.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/grids.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/email.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/ui.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/services.xml" } + - { resource: "@SyliusMolliePlugin/Resources/config/resources.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/state_machine.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/grids.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/email.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/ui.yaml" } twig: globals: - subscription_mollie_repository: "@bitbag_sylius_mollie_plugin.repository.mollie_subscription" + subscription_mollie_repository: "@sylius_mollie_plugin.repository.mollie_subscription" diff --git a/src/Resources/config/doctrine/MollieCustomer.orm.xml b/src/Resources/config/doctrine/MollieCustomer.orm.xml index 4a87728d..79f212aa 100644 --- a/src/Resources/config/doctrine/MollieCustomer.orm.xml +++ b/src/Resources/config/doctrine/MollieCustomer.orm.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" > - + diff --git a/src/Resources/config/doctrine/MollieGatewayConfig.orm.xml b/src/Resources/config/doctrine/MollieGatewayConfig.orm.xml index 9eecb68b..621d29b8 100644 --- a/src/Resources/config/doctrine/MollieGatewayConfig.orm.xml +++ b/src/Resources/config/doctrine/MollieGatewayConfig.orm.xml @@ -6,7 +6,7 @@ http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping" > - + @@ -29,20 +29,20 @@ - + - + - + diff --git a/src/Resources/config/doctrine/MollieGatewayConfigTranslation.orm.xml b/src/Resources/config/doctrine/MollieGatewayConfigTranslation.orm.xml index 9bb73560..e86c169a 100644 --- a/src/Resources/config/doctrine/MollieGatewayConfigTranslation.orm.xml +++ b/src/Resources/config/doctrine/MollieGatewayConfigTranslation.orm.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" > - + diff --git a/src/Resources/config/doctrine/MollieLogger.orm.xml b/src/Resources/config/doctrine/MollieLogger.orm.xml index 1b3ed600..38497ea1 100644 --- a/src/Resources/config/doctrine/MollieLogger.orm.xml +++ b/src/Resources/config/doctrine/MollieLogger.orm.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" > - + diff --git a/src/Resources/config/doctrine/MollieMethodImage.orm.xml b/src/Resources/config/doctrine/MollieMethodImage.orm.xml index a3cc8f46..16c86049 100644 --- a/src/Resources/config/doctrine/MollieMethodImage.orm.xml +++ b/src/Resources/config/doctrine/MollieMethodImage.orm.xml @@ -6,12 +6,12 @@ http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping" > - + - + diff --git a/src/Resources/config/doctrine/MollieSubscription.orm.xml b/src/Resources/config/doctrine/MollieSubscription.orm.xml index f3789ee9..625d8c58 100644 --- a/src/Resources/config/doctrine/MollieSubscription.orm.xml +++ b/src/Resources/config/doctrine/MollieSubscription.orm.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" > - + @@ -28,13 +28,13 @@ - + - + @@ -50,7 +50,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/src/Resources/config/doctrine/MollieSubscriptionConfiguration.orm.xml b/src/Resources/config/doctrine/MollieSubscriptionConfiguration.orm.xml index ef74b756..ec8668dc 100644 --- a/src/Resources/config/doctrine/MollieSubscriptionConfiguration.orm.xml +++ b/src/Resources/config/doctrine/MollieSubscriptionConfiguration.orm.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" > - + @@ -18,6 +18,6 @@ - + diff --git a/src/Resources/config/doctrine/MollieSubscriptionSchedule.orm.xml b/src/Resources/config/doctrine/MollieSubscriptionSchedule.orm.xml index 5b872d0e..70799aa2 100644 --- a/src/Resources/config/doctrine/MollieSubscriptionSchedule.orm.xml +++ b/src/Resources/config/doctrine/MollieSubscriptionSchedule.orm.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" > - + @@ -13,7 +13,7 @@ - + diff --git a/src/Resources/config/doctrine/OnboardingWizardStatus.orm.xml b/src/Resources/config/doctrine/OnboardingWizardStatus.orm.xml index 97c50152..1d6e058b 100644 --- a/src/Resources/config/doctrine/OnboardingWizardStatus.orm.xml +++ b/src/Resources/config/doctrine/OnboardingWizardStatus.orm.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> - + diff --git a/src/Resources/config/doctrine/PaymentSurchargeFee.orm.xml b/src/Resources/config/doctrine/PaymentSurchargeFee.orm.xml index 514f709d..a68afa3d 100644 --- a/src/Resources/config/doctrine/PaymentSurchargeFee.orm.xml +++ b/src/Resources/config/doctrine/PaymentSurchargeFee.orm.xml @@ -6,7 +6,7 @@ http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping" > - + @@ -14,6 +14,6 @@ - + diff --git a/src/Resources/config/doctrine/ProductType.orm.xml b/src/Resources/config/doctrine/ProductType.orm.xml index 2ef9b057..0a355f98 100644 --- a/src/Resources/config/doctrine/ProductType.orm.xml +++ b/src/Resources/config/doctrine/ProductType.orm.xml @@ -6,12 +6,12 @@ http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping" > - + - + diff --git a/src/Resources/config/doctrine/TemplateMollieEmail.orm.xml b/src/Resources/config/doctrine/TemplateMollieEmail.orm.xml index 733b18d5..7ac97781 100644 --- a/src/Resources/config/doctrine/TemplateMollieEmail.orm.xml +++ b/src/Resources/config/doctrine/TemplateMollieEmail.orm.xml @@ -6,7 +6,7 @@ http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping" > - + diff --git a/src/Resources/config/doctrine/TemplateMollieEmailTranslation.orm.xml b/src/Resources/config/doctrine/TemplateMollieEmailTranslation.orm.xml index aa6c09be..e69fa9e0 100644 --- a/src/Resources/config/doctrine/TemplateMollieEmailTranslation.orm.xml +++ b/src/Resources/config/doctrine/TemplateMollieEmailTranslation.orm.xml @@ -6,7 +6,7 @@ http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd" xmlns:gedmo="http://gediminasm.org/schemas/orm/doctrine-extensions-mapping" > - + diff --git a/src/Resources/config/email/payment_link.yaml b/src/Resources/config/email/payment_link.yaml index 1850004c..9a44ee83 100644 --- a/src/Resources/config/email/payment_link.yaml +++ b/src/Resources/config/email/payment_link.yaml @@ -1,5 +1,5 @@ sylius_mailer: emails: payment_link: - subject: bitbag_sylius_mollie_plugin.ui.emails.payment_link - template: "@BitBagSyliusMolliePlugin/Admin/Email/paymentLinkConfirmation.html.twig" + subject: sylius_mollie_plugin.ui.emails.payment_link + template: "@SyliusMolliePlugin/Admin/Email/paymentLinkConfirmation.html.twig" diff --git a/src/Resources/config/grids/admin/mollie_email_template.yaml b/src/Resources/config/grids/admin/mollie_email_template.yaml index 0ff8e668..7f455c7d 100644 --- a/src/Resources/config/grids/admin/mollie_email_template.yaml +++ b/src/Resources/config/grids/admin/mollie_email_template.yaml @@ -1,17 +1,17 @@ sylius_grid: grids: - bitbag_sylius_mollie_plugin_template_mollie_email: + sylius_mollie_plugin_template_mollie_email: driver: name: doctrine/orm options: - class: BitBag\SyliusMolliePlugin\Entity\TemplateMollieEmail + class: SyliusMolliePlugin\Entity\TemplateMollieEmail fields: name: type: string - label: bitbag_sylius_mollie_plugin.ui.template_name + label: sylius_mollie_plugin.ui.template_name subject: type: string - label: bitbag_sylius_mollie_plugin.ui.template_subject + label: sylius_mollie_plugin.ui.template_subject actions: main: create: @@ -24,7 +24,7 @@ sylius_grid: filters: name: type: string - label: bitbag_sylius_mollie_plugin.ui.search + label: sylius_mollie_plugin.ui.search subject: type: string - label: bitbag_sylius_mollie_plugin.ui.level + label: sylius_mollie_plugin.ui.level diff --git a/src/Resources/config/grids/admin/mollie_logger.yaml b/src/Resources/config/grids/admin/mollie_logger.yaml index 7dc4ad6b..0c92534b 100644 --- a/src/Resources/config/grids/admin/mollie_logger.yaml +++ b/src/Resources/config/grids/admin/mollie_logger.yaml @@ -1,43 +1,43 @@ sylius_grid: grids: - bitbag_sylius_mollie_plugin_mollie_logger: + sylius_mollie_plugin_mollie_logger: driver: name: doctrine/orm options: - class: BitBag\SyliusMolliePlugin\Entity\MollieLogger + class: SyliusMolliePlugin\Entity\MollieLogger sorting: dateTime: desc fields: level: type: twig - label: bitbag_sylius_mollie_plugin.ui.level + label: sylius_mollie_plugin.ui.level sortable: ~ options: - template: "@BitBagSyliusMolliePlugin/Admin/Logger/_level.html.twig" + template: "@SyliusMolliePlugin/Admin/Logger/_level.html.twig" errorCode: type: string - label: bitbag_sylius_mollie_plugin.ui.error_code + label: sylius_mollie_plugin.ui.error_code sortable: ~ message: type: string - label: bitbag_sylius_mollie_plugin.ui.message + label: sylius_mollie_plugin.ui.message sortable: ~ dateTime: type: datetime - label: bitbag_sylius_mollie_plugin.ui.data_time + label: sylius_mollie_plugin.ui.data_time sortable: ~ options: format: 'Y-m-d H:i:s' filters: date: type: date - label: bitbag_sylius_mollie_plugin.ui.search + label: sylius_mollie_plugin.ui.search options: field: dateTime label: test level: type: log_level - label: bitbag_sylius_mollie_plugin.ui.level + label: sylius_mollie_plugin.ui.level templates: filter: - log_level: "@BitBagSyliusMolliePlugin/Admin/Logger/Grid/_theme.html.twig" + log_level: "@SyliusMolliePlugin/Admin/Logger/Grid/_theme.html.twig" diff --git a/src/Resources/config/grids/admin/mollie_subscription.yaml b/src/Resources/config/grids/admin/mollie_subscription.yaml index e1062849..ae8c4d80 100644 --- a/src/Resources/config/grids/admin/mollie_subscription.yaml +++ b/src/Resources/config/grids/admin/mollie_subscription.yaml @@ -1,17 +1,17 @@ sylius_grid: grids: - bitbag_sylius_mollie_plugin_mollie_subscription: + sylius_mollie_plugin_mollie_subscription: driver: name: doctrine/orm options: - class: "%bitbag_sylius_mollie_plugin.model.mollie_subscription.class%" + class: "%sylius_mollie_plugin.model.mollie_subscription.class%" actions: item: show: type: show options: link: - route: bitbag_sylius_mollie_plugin_mollie_subscription_show + route: sylius_mollie_plugin_mollie_subscription_show parameters: id: resource.id sorting: @@ -23,22 +23,22 @@ sylius_grid: sortable: id state: type: twig - label: bitbag_sylius_mollie_plugin.ui.subscription.fields.state + label: sylius_mollie_plugin.ui.subscription.fields.state sortable: state options: - template: "@BitBagSyliusMolliePlugin/Admin/MollieSubscription/Grid/Field/state.html.twig" + template: "@SyliusMolliePlugin/Admin/MollieSubscription/Grid/Field/state.html.twig" paymentState: type: twig - label: bitbag_sylius_mollie_plugin.ui.subscription.fields.payment_state + label: sylius_mollie_plugin.ui.subscription.fields.payment_state sortable: paymentState options: - template: "@BitBagSyliusMolliePlugin/Admin/MollieSubscription/Grid/Field/payment_state.html.twig" + template: "@SyliusMolliePlugin/Admin/MollieSubscription/Grid/Field/payment_state.html.twig" orders: type: twig - label: bitbag_sylius_mollie_plugin.ui.subscription.fields.orders + label: sylius_mollie_plugin.ui.subscription.fields.orders path: . options: - template: "@BitBagSyliusMolliePlugin/Admin/MollieSubscription/Grid/Field/orders.html.twig" + template: "@SyliusMolliePlugin/Admin/MollieSubscription/Grid/Field/orders.html.twig" createdAt: type: datetime @@ -48,33 +48,33 @@ sylius_grid: format: 'Y-m-d H:i:s' startedAt: type: datetime - label: bitbag_sylius_mollie_plugin.ui.subscription.fields.started_at + label: sylius_mollie_plugin.ui.subscription.fields.started_at sortable: startedAt options: format: 'Y-m-d H:i:s' recentFailedPaymentsCount: type: string sortable: recentFailedPaymentsCount - label: bitbag_sylius_mollie_plugin.ui.subscription.fields.recent_failed_payments_count + label: sylius_mollie_plugin.ui.subscription.fields.recent_failed_payments_count filters: createdAt: type: date - label: bitbag_sylius_mollie_plugin.ui.subscription.grid.filters.created_at + label: sylius_mollie_plugin.ui.subscription.grid.filters.created_at options: field: createdAt label: test startedAt: type: date - label: bitbag_sylius_mollie_plugin.ui.subscription.grid.filters.started_at + label: sylius_mollie_plugin.ui.subscription.grid.filters.started_at options: field: startedAt label: test state: type: subscription_state - label: bitbag_sylius_mollie_plugin.ui.subscription.grid.filters.state + label: sylius_mollie_plugin.ui.subscription.grid.filters.state options: field: state label: test templates: filter: - subscription_state: "@BitBagSyliusMolliePlugin/Admin/Logger/Grid/_theme.html.twig" + subscription_state: "@SyliusMolliePlugin/Admin/Logger/Grid/_theme.html.twig" diff --git a/src/Resources/config/grids/admin/product_type.yaml b/src/Resources/config/grids/admin/product_type.yaml index f77b98d1..f6541f1b 100644 --- a/src/Resources/config/grids/admin/product_type.yaml +++ b/src/Resources/config/grids/admin/product_type.yaml @@ -1,10 +1,10 @@ sylius_grid: grids: - bitbag_sylius_mollie_plugin_admin_product_type: + sylius_mollie_plugin_admin_product_type: driver: name: doctrine/orm options: - class: BitBag\SyliusMolliePlugin\Entity\ProductType + class: SyliusMolliePlugin\Entity\ProductType fields: name: type: string diff --git a/src/Resources/config/grids/shop/cancel_subscription_mollie.yaml b/src/Resources/config/grids/shop/cancel_subscription_mollie.yaml index 32075f37..dcd679c9 100644 --- a/src/Resources/config/grids/shop/cancel_subscription_mollie.yaml +++ b/src/Resources/config/grids/shop/cancel_subscription_mollie.yaml @@ -1,16 +1,16 @@ sylius_grid: templates: action: - cancel_subscription_mollie: "@BitBagSyliusMolliePlugin/Shop/Grid/Action/cancelSubscriptionMollie.html.twig" + cancel_subscription_mollie: "@SyliusMolliePlugin/Shop/Grid/Action/cancelSubscriptionMollie.html.twig" grids: sylius_shop_account_order: actions: item: cancel_subscription_mollie: type: cancel_subscription_mollie - label: bitbag_sylius_mollie_plugin.ui.cancel_subscription + label: sylius_mollie_plugin.ui.cancel_subscription options: link: - route: bitbag_sylius_mollie_plugin_cancel_subscription_mollie + route: sylius_mollie_plugin_cancel_subscription_mollie parameters: orderId: resource.id diff --git a/src/Resources/config/resources.yaml b/src/Resources/config/resources.yaml index 1f3a729d..4129d66c 100644 --- a/src/Resources/config/resources.yaml +++ b/src/Resources/config/resources.yaml @@ -1,14 +1,14 @@ imports: - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/resources/mollie_methods.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/resources/payment_surcharge_fee.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/resources/mollie_method_image.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/resources/mollie_logger.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/resources/mollie_customer.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/resources/mollie_email_template.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/resources/order.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/resources/product_type.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/resources/payment_method.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/resources/onboarding_wizard_status.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/resources/mollie_subscription.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/resources/mollie_subscription_schedule.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/resources/mollie_methods.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/resources/payment_surcharge_fee.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/resources/mollie_method_image.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/resources/mollie_logger.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/resources/mollie_customer.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/resources/mollie_email_template.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/resources/order.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/resources/product_type.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/resources/payment_method.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/resources/onboarding_wizard_status.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/resources/mollie_subscription.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/resources/mollie_subscription_schedule.yaml" } - { resource: "@SyliusRefundPlugin/Resources/config/app/config.yml" } diff --git a/src/Resources/config/resources/mollie_customer.yaml b/src/Resources/config/resources/mollie_customer.yaml index 62e49bb3..79027b0c 100644 --- a/src/Resources/config/resources/mollie_customer.yaml +++ b/src/Resources/config/resources/mollie_customer.yaml @@ -1,7 +1,7 @@ sylius_resource: resources: - bitbag_sylius_mollie_plugin.mollie_customer: + sylius_mollie_plugin.mollie_customer: driver: doctrine/orm classes: - model: BitBag\SyliusMolliePlugin\Entity\MollieCustomer - interface: BitBag\SyliusMolliePlugin\Entity\MollieCustomerInterface + model: SyliusMolliePlugin\Entity\MollieCustomer + interface: SyliusMolliePlugin\Entity\MollieCustomerInterface diff --git a/src/Resources/config/resources/mollie_email_template.yaml b/src/Resources/config/resources/mollie_email_template.yaml index 0a56ab7f..8aee328c 100644 --- a/src/Resources/config/resources/mollie_email_template.yaml +++ b/src/Resources/config/resources/mollie_email_template.yaml @@ -1,13 +1,13 @@ sylius_resource: resources: - bitbag_sylius_mollie_plugin.template_mollie_email: + sylius_mollie_plugin.template_mollie_email: driver: doctrine/orm classes: - model: BitBag\SyliusMolliePlugin\Entity\TemplateMollieEmail - interface: BitBag\SyliusMolliePlugin\Entity\TemplateMollieEmailInterface - form: BitBag\SyliusMolliePlugin\Form\Type\TemplateMollieEmailType + model: SyliusMolliePlugin\Entity\TemplateMollieEmail + interface: SyliusMolliePlugin\Entity\TemplateMollieEmailInterface + form: SyliusMolliePlugin\Form\Type\TemplateMollieEmailType translation: classes: - model: BitBag\SyliusMolliePlugin\Entity\TemplateMollieEmailTranslation - interface: BitBag\SyliusMolliePlugin\Entity\TemplateMollieEmailTranslationInterface - repository: BitBag\SyliusMolliePlugin\Repository\TemplateMollieEmailTranslationRepository + model: SyliusMolliePlugin\Entity\TemplateMollieEmailTranslation + interface: SyliusMolliePlugin\Entity\TemplateMollieEmailTranslationInterface + repository: SyliusMolliePlugin\Repository\TemplateMollieEmailTranslationRepository diff --git a/src/Resources/config/resources/mollie_logger.yaml b/src/Resources/config/resources/mollie_logger.yaml index 930b7dd4..7a9af5f9 100644 --- a/src/Resources/config/resources/mollie_logger.yaml +++ b/src/Resources/config/resources/mollie_logger.yaml @@ -1,6 +1,6 @@ sylius_resource: resources: - bitbag_sylius_mollie_plugin.mollie_logger: + sylius_mollie_plugin.mollie_logger: driver: doctrine/orm classes: - model: BitBag\SyliusMolliePlugin\Entity\MollieLogger + model: SyliusMolliePlugin\Entity\MollieLogger diff --git a/src/Resources/config/resources/mollie_method_image.yaml b/src/Resources/config/resources/mollie_method_image.yaml index c8f2e9e8..0d202e96 100644 --- a/src/Resources/config/resources/mollie_method_image.yaml +++ b/src/Resources/config/resources/mollie_method_image.yaml @@ -1,5 +1,5 @@ sylius_resource: resources: - bitbag_sylius_mollie_plugin.mollie_method_image: + sylius_mollie_plugin.mollie_method_image: classes: - model: BitBag\SyliusMolliePlugin\Entity\MollieMethodImage + model: SyliusMolliePlugin\Entity\MollieMethodImage diff --git a/src/Resources/config/resources/mollie_methods.yaml b/src/Resources/config/resources/mollie_methods.yaml index daf89e37..7966cfda 100644 --- a/src/Resources/config/resources/mollie_methods.yaml +++ b/src/Resources/config/resources/mollie_methods.yaml @@ -1,11 +1,11 @@ sylius_resource: resources: - bitbag_sylius_mollie_plugin.mollie_gateway_config: + sylius_mollie_plugin.mollie_gateway_config: driver: doctrine/orm classes: - model: BitBag\SyliusMolliePlugin\Entity\MollieGatewayConfig - repository: BitBag\SyliusMolliePlugin\Repository\MollieGatewayConfigRepository + model: SyliusMolliePlugin\Entity\MollieGatewayConfig + repository: SyliusMolliePlugin\Repository\MollieGatewayConfigRepository translation: classes: - model: BitBag\SyliusMolliePlugin\Entity\MollieGatewayConfigTranslation - interface: BitBag\SyliusMolliePlugin\Entity\MollieGatewayConfigTranslationInterface + model: SyliusMolliePlugin\Entity\MollieGatewayConfigTranslation + interface: SyliusMolliePlugin\Entity\MollieGatewayConfigTranslationInterface diff --git a/src/Resources/config/resources/mollie_subscription.yaml b/src/Resources/config/resources/mollie_subscription.yaml index 9ef172a6..d65fec95 100644 --- a/src/Resources/config/resources/mollie_subscription.yaml +++ b/src/Resources/config/resources/mollie_subscription.yaml @@ -1,8 +1,8 @@ sylius_resource: resources: - bitbag_sylius_mollie_plugin.mollie_subscription: + sylius_mollie_plugin.mollie_subscription: driver: doctrine/orm classes: - model: BitBag\SyliusMolliePlugin\Entity\MollieSubscription - interface: BitBag\SyliusMolliePlugin\Entity\MollieSubscriptionInterface - repository: BitBag\SyliusMolliePlugin\Repository\MollieSubscriptionRepository + model: SyliusMolliePlugin\Entity\MollieSubscription + interface: SyliusMolliePlugin\Entity\MollieSubscriptionInterface + repository: SyliusMolliePlugin\Repository\MollieSubscriptionRepository diff --git a/src/Resources/config/resources/mollie_subscription_schedule.yaml b/src/Resources/config/resources/mollie_subscription_schedule.yaml index 8bdb7d1f..44f2558f 100644 --- a/src/Resources/config/resources/mollie_subscription_schedule.yaml +++ b/src/Resources/config/resources/mollie_subscription_schedule.yaml @@ -1,7 +1,7 @@ sylius_resource: resources: - bitbag_sylius_mollie_plugin.mollie_subscription_schedule: + sylius_mollie_plugin.mollie_subscription_schedule: driver: doctrine/orm classes: - model: BitBag\SyliusMolliePlugin\Entity\MollieSubscriptionSchedule - interface: BitBag\SyliusMolliePlugin\Entity\MollieSubscriptionScheduleInterface + model: SyliusMolliePlugin\Entity\MollieSubscriptionSchedule + interface: SyliusMolliePlugin\Entity\MollieSubscriptionScheduleInterface diff --git a/src/Resources/config/resources/onboarding_wizard_status.yaml b/src/Resources/config/resources/onboarding_wizard_status.yaml index fed325c4..dfbe0e9a 100644 --- a/src/Resources/config/resources/onboarding_wizard_status.yaml +++ b/src/Resources/config/resources/onboarding_wizard_status.yaml @@ -1,7 +1,7 @@ sylius_resource: resources: - bitbag_sylius_mollie_plugin.onboarding_wizard_status: + sylius_mollie_plugin.onboarding_wizard_status: driver: doctrine/orm classes: - model: BitBag\SyliusMolliePlugin\Entity\OnboardingWizardStatus - interface: BitBag\SyliusMolliePlugin\Entity\OnboardingWizardStatusInterface + model: SyliusMolliePlugin\Entity\OnboardingWizardStatus + interface: SyliusMolliePlugin\Entity\OnboardingWizardStatusInterface diff --git a/src/Resources/config/resources/order.yaml b/src/Resources/config/resources/order.yaml index cb09ec0f..27bc6e00 100644 --- a/src/Resources/config/resources/order.yaml +++ b/src/Resources/config/resources/order.yaml @@ -2,4 +2,4 @@ sylius_order: resources: order: classes: - repository: BitBag\SyliusMolliePlugin\Repository\OrderRepository + repository: SyliusMolliePlugin\Repository\OrderRepository diff --git a/src/Resources/config/resources/payment_method.yaml b/src/Resources/config/resources/payment_method.yaml index 3ccbc772..0e9ea74a 100644 --- a/src/Resources/config/resources/payment_method.yaml +++ b/src/Resources/config/resources/payment_method.yaml @@ -2,4 +2,4 @@ sylius_payment: resources: payment_method: classes: - repository: BitBag\SyliusMolliePlugin\Repository\PaymentMethodRepository + repository: SyliusMolliePlugin\Repository\PaymentMethodRepository diff --git a/src/Resources/config/resources/payment_surcharge_fee.yaml b/src/Resources/config/resources/payment_surcharge_fee.yaml index 219fe60b..b15424b4 100644 --- a/src/Resources/config/resources/payment_surcharge_fee.yaml +++ b/src/Resources/config/resources/payment_surcharge_fee.yaml @@ -1,6 +1,6 @@ sylius_resource: resources: - bitbag_sylius_mollie_plugin.payment_surcharge_fee: + sylius_mollie_plugin.payment_surcharge_fee: driver: doctrine/orm classes: - model: BitBag\SyliusMolliePlugin\Entity\PaymentSurchargeFee + model: SyliusMolliePlugin\Entity\PaymentSurchargeFee diff --git a/src/Resources/config/resources/product_type.yaml b/src/Resources/config/resources/product_type.yaml index 38ec4b1f..f830487b 100644 --- a/src/Resources/config/resources/product_type.yaml +++ b/src/Resources/config/resources/product_type.yaml @@ -1,8 +1,8 @@ sylius_resource: resources: - bitbag_sylius_mollie_plugin.product_type: + sylius_mollie_plugin.product_type: driver: doctrine/orm classes: - model: BitBag\SyliusMolliePlugin\Entity\ProductType - interface: BitBag\SyliusMolliePlugin\Entity\ProductTypeInterface - form: BitBag\SyliusMolliePlugin\Form\Type\ProductTypeType + model: SyliusMolliePlugin\Entity\ProductType + interface: SyliusMolliePlugin\Entity\ProductTypeInterface + form: SyliusMolliePlugin\Form\Type\ProductTypeType diff --git a/src/Resources/config/routing.yaml b/src/Resources/config/routing.yaml index aca3df3d..b33f25a3 100644 --- a/src/Resources/config/routing.yaml +++ b/src/Resources/config/routing.yaml @@ -1,8 +1,8 @@ -bitbag_admin: +mollie_admin: resource: "routing/admin.yaml" prefix: /admin -bitbag_shop: +mollie_shop: resource: "routing/shop.yaml" prefix: /{_locale} requirements: diff --git a/src/Resources/config/routing/admin.yaml b/src/Resources/config/routing/admin.yaml index 72afde54..dcfa5400 100644 --- a/src/Resources/config/routing/admin.yaml +++ b/src/Resources/config/routing/admin.yaml @@ -1,22 +1,22 @@ -bitbag_mollie_methods: +mollie_methods: resource: "admin/methods.yaml" -bitbag_mollie_logger: +mollie_logger: resource: "admin/mollie_logger.yaml" -bitbag_mollie_logo: +mollie_logo: resource: "admin/mollie_logo.yaml" -bitbag_mollie_payment_refund: +mollie_payment_refund: resource: "admin/payment_refund.yaml" -bitbag_mollie_partial_ship: +mollie_partial_ship: resource: "admin/partial_ship.yaml" -bitbag_mollie_payment_link: +mollie_payment_link: resource: "admin/paymentlink.yaml" -bitbag_mollie_email_template: +mollie_email_template: resource: "admin/mollie_email_template.yaml" -bitbag_mollie_product_type: +mollie_product_type: resource: "admin/product_type.yaml" -bitbag_sylius_mollie_plugin_onboarding_wizard_status: +sylius_mollie_plugin_onboarding_wizard_status: resource: "admin/onboarding_wizard/status.yaml" -bitbag_sylius_mollie_plugin_onboarding_wizard_completed: +sylius_mollie_plugin_onboarding_wizard_completed: resource: "admin/onboarding_wizard/completed.yaml" -bitbag_sylius_mollie_plugin_mollie_subscription: +sylius_mollie_plugin_mollie_subscription: resource: "admin/mollie_subscription.yaml" diff --git a/src/Resources/config/routing/admin/methods.yaml b/src/Resources/config/routing/admin/methods.yaml index 9a4bdb09..306dc6e6 100644 --- a/src/Resources/config/routing/admin/methods.yaml +++ b/src/Resources/config/routing/admin/methods.yaml @@ -1,19 +1,19 @@ -bitbag_admin_methods: +mollie_admin_methods: path: /mollie/methods/{id}/all methods: [GET] defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.admin.methods + _controller: sylius_mollie_plugin.controller.action.admin.methods requirements: id: '\d+' -bitbag_admin_test_api_keys: +mollie_admin_test_api_keys: path: /mollie/methods/test methods: [GET] defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.admin.test_api_keys_action + _controller: sylius_mollie_plugin.controller.action.admin.test_api_keys_action -bitbag_admin_change_position: +mollie_admin_change_position: path: /mollie/methods/change-position methods: [GET] defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.admin.change_position_payment_method_action + _controller: sylius_mollie_plugin.controller.action.admin.change_position_payment_method_action diff --git a/src/Resources/config/routing/admin/mollie_email_template.yaml b/src/Resources/config/routing/admin/mollie_email_template.yaml index bfadbdef..1f8d03f8 100644 --- a/src/Resources/config/routing/admin/mollie_email_template.yaml +++ b/src/Resources/config/routing/admin/mollie_email_template.yaml @@ -1,17 +1,17 @@ -bitbag_sylius_mollie_plugin_mollie_logger: +sylius_mollie_plugin_mollie_logger: resource: | - alias: bitbag_sylius_mollie_plugin.template_mollie_email + alias: sylius_mollie_plugin.template_mollie_email section: admin path: /mollie/email-template templates: "@SyliusAdmin\\Crud" redirect: update permission: true - grid: bitbag_sylius_mollie_plugin_template_mollie_email + grid: sylius_mollie_plugin_template_mollie_email vars: all: - subheader: bitbag_sylius_mollie_plugin.ui.mollie_email_template + subheader: sylius_mollie_plugin.ui.mollie_email_template templates: - form: "@BitBagSyliusMolliePlugin/Admin/TemplateMollieEmail/Crud/_form.html.twig" + form: "@SyliusMolliePlugin/Admin/TemplateMollieEmail/Crud/_form.html.twig" index: icon: 'email' type: sylius.resource diff --git a/src/Resources/config/routing/admin/mollie_logger.yaml b/src/Resources/config/routing/admin/mollie_logger.yaml index b403c629..f72150f0 100644 --- a/src/Resources/config/routing/admin/mollie_logger.yaml +++ b/src/Resources/config/routing/admin/mollie_logger.yaml @@ -1,15 +1,15 @@ -bitbag_sylius_mollie_plugin_mollie_logger: +sylius_mollie_plugin_mollie_logger: resource: | - alias: bitbag_sylius_mollie_plugin.mollie_logger + alias: sylius_mollie_plugin.mollie_logger section: admin path: /mollie/logger permission: true templates: "@SyliusAdmin\\Crud" redirect: update - grid: bitbag_sylius_mollie_plugin_mollie_logger + grid: sylius_mollie_plugin_mollie_logger vars: all: - subheader: bitbag_sylius_mollie_plugin.ui.logger_list + subheader: sylius_mollie_plugin.ui.logger_list index: icon: 'tags' type: sylius.resource diff --git a/src/Resources/config/routing/admin/mollie_logo.yaml b/src/Resources/config/routing/admin/mollie_logo.yaml index fa75c796..8f10ae26 100644 --- a/src/Resources/config/routing/admin/mollie_logo.yaml +++ b/src/Resources/config/routing/admin/mollie_logo.yaml @@ -1,5 +1,5 @@ -bitbag_admin_delete_logo: +mollie_admin_delete_logo: path: /payment-methods/delete/logo/ methods: [DELETE] defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.admin.delete_payment_method_image + _controller: sylius_mollie_plugin.controller.action.admin.delete_payment_method_image diff --git a/src/Resources/config/routing/admin/mollie_subscription.yaml b/src/Resources/config/routing/admin/mollie_subscription.yaml index 714f0a08..9d978a16 100644 --- a/src/Resources/config/routing/admin/mollie_subscription.yaml +++ b/src/Resources/config/routing/admin/mollie_subscription.yaml @@ -1,35 +1,35 @@ -bitbag_sylius_mollie_plugin_mollie_subscription: +sylius_mollie_plugin_mollie_subscription: resource: | - alias: bitbag_sylius_mollie_plugin.mollie_subscription + alias: sylius_mollie_plugin.mollie_subscription section: admin path: /mollie/subscription permission: true templates: "@SyliusAdmin\\Crud" only: ['index'] redirect: update - grid: bitbag_sylius_mollie_plugin_mollie_subscription + grid: sylius_mollie_plugin_mollie_subscription vars: all: - subheader: bitbag_sylius_mollie_plugin.ui.subscription_list + subheader: sylius_mollie_plugin.ui.subscription_list index: icon: 'tags' type: sylius.resource -bitbag_sylius_mollie_plugin_mollie_subscription_show: +sylius_mollie_plugin_mollie_subscription_show: path: /mollie/subscription/{id} methods: [GET] defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.admin.mollie_subscription_controller:showAction + _controller: sylius_mollie_plugin.controller.action.admin.mollie_subscription_controller::showAction _sylius: section: admin permission: true - template: "@BitBagSyliusMolliePlugin/Admin/MollieSubscription/show.html.twig" + template: "@SyliusMolliePlugin/Admin/MollieSubscription/show.html.twig" -bitbag_sylius_mollie_plugin_mollie_subscription_cancel: +sylius_mollie_plugin_mollie_subscription_cancel: path: /mollie/subscription/{id}/cancel methods: [PUT] defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.admin.mollie_subscription_controller:applyStateMachineTransitionAction + _controller: sylius_mollie_plugin.controller.action.admin.mollie_subscription_controller::applyStateMachineTransitionAction _sylius: permission: true state_machine: @@ -37,11 +37,11 @@ bitbag_sylius_mollie_plugin_mollie_subscription_cancel: transition: cancel redirect: referer -bitbag_sylius_mollie_plugin_mollie_subscription_pause: +sylius_mollie_plugin_mollie_subscription_pause: path: /mollie/subscription/{id}/pause methods: [PUT] defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.admin.mollie_subscription_controller:applyStateMachineTransitionAction + _controller: sylius_mollie_plugin.controller.action.admin.mollie_subscription_controller::applyStateMachineTransitionAction _sylius: permission: true state_machine: @@ -49,11 +49,11 @@ bitbag_sylius_mollie_plugin_mollie_subscription_pause: transition: pause redirect: referer -bitbag_sylius_mollie_plugin_mollie_subscription_resume: +sylius_mollie_plugin_mollie_subscription_resume: path: /mollie/subscription/{id}/resume methods: [PUT] defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.admin.mollie_subscription_controller:applyStateMachineTransitionAction + _controller: sylius_mollie_plugin.controller.action.admin.mollie_subscription_controller::applyStateMachineTransitionAction _sylius: permission: true state_machine: diff --git a/src/Resources/config/routing/admin/onboarding_wizard/completed.yaml b/src/Resources/config/routing/admin/onboarding_wizard/completed.yaml index 8f7ab191..83ef81cc 100644 --- a/src/Resources/config/routing/admin/onboarding_wizard/completed.yaml +++ b/src/Resources/config/routing/admin/onboarding_wizard/completed.yaml @@ -1,4 +1,4 @@ -bitbag_sylius_mollie_plugin_onboarding_wizard_completed: +sylius_mollie_plugin_onboarding_wizard_completed: path: /onboarding-wizard/completed - controller: bitbag_sylius_mollie_plugin.controller.onboarding_wizard.completed + controller: sylius_mollie_plugin.controller.onboarding_wizard.completed methods: [POST] diff --git a/src/Resources/config/routing/admin/onboarding_wizard/status.yaml b/src/Resources/config/routing/admin/onboarding_wizard/status.yaml index 5f38bd3e..60b0773c 100644 --- a/src/Resources/config/routing/admin/onboarding_wizard/status.yaml +++ b/src/Resources/config/routing/admin/onboarding_wizard/status.yaml @@ -1,4 +1,4 @@ -bitbag_sylius_mollie_plugin_onboarding_wizard_status: +sylius_mollie_plugin_onboarding_wizard_status: path: /onboarding-wizard/status - controller: bitbag_sylius_mollie_plugin.controller.onboarding_wizard.status + controller: sylius_mollie_plugin.controller.onboarding_wizard.status methods: [GET] diff --git a/src/Resources/config/routing/admin/partial_ship.yaml b/src/Resources/config/routing/admin/partial_ship.yaml index 0bafd1b9..3176bbf5 100644 --- a/src/Resources/config/routing/admin/partial_ship.yaml +++ b/src/Resources/config/routing/admin/partial_ship.yaml @@ -1,15 +1,15 @@ -bitbag_admin_shipment_split: +mollie_admin_shipment_split: path: /orders/{orderId}/shipments/{id}/split/ methods: [GET, POST] defaults: - _controller: sylius.controller.shipment:createAction + _controller: sylius.controller.shipment::createAction _sylius: factory: - method: [expr:service('bitbag_sylius_mollie_plugin.factory.shipment_factory'), createWithOrderInventorySourceAndMethodFromShipment] + method: [expr:service('sylius_mollie_plugin.factory.shipment_factory'), createWithOrderInventorySourceAndMethodFromShipment] arguments: [expr:notFoundOnNull(service('sylius.repository.shipment').find($id))] - flash: bitbag_sylius_mollie_plugin.admin.shipment.successfuly_split_and_sent + flash: sylius_mollie_plugin.admin.shipment.successfuly_split_and_sent form: - type: BitBag\SyliusMolliePlugin\Form\Type\PartialShip\PartialShipType + type: SyliusMolliePlugin\Form\Type\PartialShip\PartialShipType options: shipment: expr:notFoundOnNull(service('sylius.repository.shipment').find($id)) permission: true @@ -20,15 +20,15 @@ bitbag_admin_shipment_split: state_machine: graph: sylius_shipment transition: create_and_ship - template: '@BitBagSyliusMolliePlugin/Admin/PartialShip/shipmentSplit.html.twig' + template: '@SyliusMolliePlugin/Admin/PartialShip/shipmentSplit.html.twig' vars: - header: bitbag_sylius_mollie_plugin.ui.splitting_shipment_for_order + header: sylius_mollie_plugin.ui.splitting_shipment_for_order icon: boxes route: - name: bitbag_admin_shipment_split + name: mollie_admin_shipment_split parameters: id: $id orderId: $orderId templates: - header_title: '@BitBagSyliusMolliePlugin/Admin/PartialShip/_headerTitle.html.twig' - breadcrumb: '@BitBagSyliusMolliePlugin/Admin/PartialShip/_breadcrumb.html.twig' + header_title: '@SyliusMolliePlugin/Admin/PartialShip/_headerTitle.html.twig' + breadcrumb: '@SyliusMolliePlugin/Admin/PartialShip/_breadcrumb.html.twig' diff --git a/src/Resources/config/routing/admin/payment_refund.yaml b/src/Resources/config/routing/admin/payment_refund.yaml index b607cfab..146bd14b 100644 --- a/src/Resources/config/routing/admin/payment_refund.yaml +++ b/src/Resources/config/routing/admin/payment_refund.yaml @@ -2,13 +2,13 @@ sylius_admin_order_payment_refund: path: /orders/{orderId}/payments/{id}/refund methods: [PUT,POST] defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.admin.refund + _controller: sylius_mollie_plugin.controller.action.admin.refund -bitbag_sylius_mollie_plugin_payum_refund: +sylius_mollie_plugin_payum_refund: resource: "@PayumBundle/Resources/config/routing/refund.xml" prefix: /admin sylius_refund_refund_units: path: /orders/{orderNumber}/refund-units defaults: - _controller: bitbag_sylius_mollie_plugin.sylius_mollie_plugin.controller.action.admin.refund_units_action + _controller: sylius_mollie_plugin.sylius_mollie_plugin.controller.action.admin.refund_units_action diff --git a/src/Resources/config/routing/admin/paymentlink.yaml b/src/Resources/config/routing/admin/paymentlink.yaml index ea08e74d..f25f1a24 100644 --- a/src/Resources/config/routing/admin/paymentlink.yaml +++ b/src/Resources/config/routing/admin/paymentlink.yaml @@ -1,5 +1,5 @@ -bitbag_sylius_mollie_plugin_paymentlink: +sylius_mollie_plugin_paymentlink: path: /orders/{orderNumber}/paymentlink methods: [GET, PUT] defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.admin.generate_paymentlink_action + _controller: sylius_mollie_plugin.controller.action.admin.generate_paymentlink_action diff --git a/src/Resources/config/routing/admin/product_type.yaml b/src/Resources/config/routing/admin/product_type.yaml index 12919739..5338cda2 100644 --- a/src/Resources/config/routing/admin/product_type.yaml +++ b/src/Resources/config/routing/admin/product_type.yaml @@ -1,10 +1,10 @@ app_admin_product_type: resource: | - alias: bitbag_sylius_mollie_plugin.product_type + alias: sylius_mollie_plugin.product_type section: admin templates: "@SyliusAdmin\\Crud" except: ['show'] - grid: bitbag_sylius_mollie_plugin_admin_product_type + grid: sylius_mollie_plugin_admin_product_type redirect: index permission: true type: sylius.resource diff --git a/src/Resources/config/routing/shop.yaml b/src/Resources/config/routing/shop.yaml index e6c8cbd7..c6ac3fe7 100644 --- a/src/Resources/config/routing/shop.yaml +++ b/src/Resources/config/routing/shop.yaml @@ -1,6 +1,6 @@ -bitbag_mollie_subscription: +mollie_subscription: resource: "shop/subscription_mollie.yaml" -bitbag_mollie_payment_fee_ajax: +mollie_payment_fee_ajax: resource: "shop/paymentFee.yaml" -bitbag_mollie_apple_pay: +mollie_apple_pay: resource: "shop/applePay.yaml" diff --git a/src/Resources/config/routing/shop/applePay.yaml b/src/Resources/config/routing/shop/applePay.yaml index f3015b16..b5925057 100644 --- a/src/Resources/config/routing/shop/applePay.yaml +++ b/src/Resources/config/routing/shop/applePay.yaml @@ -1,20 +1,20 @@ -bitbag_sylius_mollie_plugin_apple_pay_validation: +sylius_mollie_plugin_apple_pay_validation: methods: [POST] path: /mollie/apple-direct/validation defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.shop.apple_pay_validation_action + _controller: sylius_mollie_plugin.controller.action.shop.apple_pay_validation_action -bitbag_sylius_mollie_plugin_apple_pay_payment: +sylius_mollie_plugin_apple_pay_payment: methods: [POST] path: /apple-pay-payment defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.shop.apple_pay_create_payment + _controller: sylius_mollie_plugin.controller.action.shop.apple_pay_create_payment -bitbag_mollie_shop_checkout_apple_complete: +mollie_shop_checkout_apple_complete: path: /mollie/apple-direct/complete methods: [POST, GET] defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.shop.order_controller:updateAppleOrderAction + _controller: sylius_mollie_plugin.controller.action.shop.order_controller::updateAppleOrderAction _sylius: event: complete flash: false diff --git a/src/Resources/config/routing/shop/paymentFee.yaml b/src/Resources/config/routing/shop/paymentFee.yaml index 26f9f6ab..37423791 100644 --- a/src/Resources/config/routing/shop/paymentFee.yaml +++ b/src/Resources/config/routing/shop/paymentFee.yaml @@ -1,4 +1,4 @@ -bitbag_sylius_mollie_plugin_payment_fee_calculate: +sylius_mollie_plugin_payment_fee_calculate: path: /payment-fee-calculate/{methodId} defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.shop.payment_fee_calculate_action + _controller: sylius_mollie_plugin.controller.action.shop.payment_fee_calculate_action diff --git a/src/Resources/config/routing/shop/payment_fee.yaml b/src/Resources/config/routing/shop/payment_fee.yaml index 26f9f6ab..37423791 100644 --- a/src/Resources/config/routing/shop/payment_fee.yaml +++ b/src/Resources/config/routing/shop/payment_fee.yaml @@ -1,4 +1,4 @@ -bitbag_sylius_mollie_plugin_payment_fee_calculate: +sylius_mollie_plugin_payment_fee_calculate: path: /payment-fee-calculate/{methodId} defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.shop.payment_fee_calculate_action + _controller: sylius_mollie_plugin.controller.action.shop.payment_fee_calculate_action diff --git a/src/Resources/config/routing/shop/subscription_mollie.yaml b/src/Resources/config/routing/shop/subscription_mollie.yaml index a5569eb7..3ccf3faa 100644 --- a/src/Resources/config/routing/shop/subscription_mollie.yaml +++ b/src/Resources/config/routing/shop/subscription_mollie.yaml @@ -1,8 +1,8 @@ -bitbag_sylius_mollie_plugin_cancel_subscription_mollie: +sylius_mollie_plugin_cancel_subscription_mollie: path: /account/order/{orderId}/subscription-mollie/cancel methods: [PUT] defaults: - _controller: bitbag_sylius_mollie_plugin.controller.action.admin.mollie_subscription_controller:applyStateMachineTransitionAction + _controller: sylius_mollie_plugin.controller.action.admin.mollie_subscription_controller::applyStateMachineTransitionAction _sylius: repository: method: findOneByOrderIdAsString @@ -12,4 +12,4 @@ bitbag_sylius_mollie_plugin_cancel_subscription_mollie: graph: mollie_subscription_payment_graph_manual transition: cancel redirect: referer - flash: bitbag_sylius_mollie_plugin.subscription.cancelled + flash: sylius_mollie_plugin.subscription.cancelled diff --git a/src/Resources/config/services/action.xml b/src/Resources/config/services/action.xml index 03e509c5..e43fd66e 100644 --- a/src/Resources/config/services/action.xml +++ b/src/Resources/config/services/action.xml @@ -4,133 +4,130 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - - - + + + + - - - + + + - - - + + + - - - - + + + - - - + + + - - - + + + - - - + + + - + - - - - - + + + + + - + - - - - + + + + - - - + + + - - - - - + + + + - + - - - - - + + + + - + - - + + - + class="SyliusMolliePlugin\Action\StateMachine\Applicator\SubscriptionAndPaymentIdApplicator"> + + class="SyliusMolliePlugin\Action\StateMachine\Applicator\SubscriptionAndSyliusPaymentApplicator"> + class="SyliusMolliePlugin\Action\StateMachine\Transition\PaymentStateMachineTransition"> + class="SyliusMolliePlugin\Action\StateMachine\Transition\ProcessingStateMachineTransition"> + class="SyliusMolliePlugin\Action\StateMachine\Transition\StateMachineTransition"> - - + + - + - + diff --git a/src/Resources/config/services/applicator.xml b/src/Resources/config/services/applicator.xml index 7a22ca57..25211756 100644 --- a/src/Resources/config/services/applicator.xml +++ b/src/Resources/config/services/applicator.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/src/Resources/config/services/calculator.xml b/src/Resources/config/services/calculator.xml index d218afdb..db6878a0 100644 --- a/src/Resources/config/services/calculator.xml +++ b/src/Resources/config/services/calculator.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - + + diff --git a/src/Resources/config/services/checker/apple.xml b/src/Resources/config/services/checker/apple.xml index 58736235..23f18b30 100644 --- a/src/Resources/config/services/checker/apple.xml +++ b/src/Resources/config/services/checker/apple.xml @@ -3,13 +3,13 @@ - https://repo.packagist.org/p/bitbag/mollie-plugin.json + https://repo.packagist.org/p/mollie/sylius-plugin.json - - + + diff --git a/src/Resources/config/services/checker/gateway.xml b/src/Resources/config/services/checker/gateway.xml index ac0f3104..db79363a 100644 --- a/src/Resources/config/services/checker/gateway.xml +++ b/src/Resources/config/services/checker/gateway.xml @@ -3,12 +3,12 @@ - https://repo.packagist.org/p/bitbag/mollie-plugin.json + https://repo.packagist.org/p/mollie/sylius-plugin.json - + diff --git a/src/Resources/config/services/checker/refund.xml b/src/Resources/config/services/checker/refund.xml index 171a30d8..f9f3cce2 100644 --- a/src/Resources/config/services/checker/refund.xml +++ b/src/Resources/config/services/checker/refund.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - + + - diff --git a/src/Resources/config/services/checker/version.xml b/src/Resources/config/services/checker/version.xml index 28467554..46057e75 100644 --- a/src/Resources/config/services/checker/version.xml +++ b/src/Resources/config/services/checker/version.xml @@ -3,14 +3,14 @@ - https://repo.packagist.org/p/bitbag/mollie-plugin.json + https://repo.packagist.org/p/mollie/sylius-plugin.json - + - %bitbag_sylius_mollie_plugin.admin.version.uri% + %sylius_mollie_plugin.admin.version.uri% diff --git a/src/Resources/config/services/checker/voucher.xml b/src/Resources/config/services/checker/voucher.xml index f0d5634f..4be141cd 100644 --- a/src/Resources/config/services/checker/voucher.xml +++ b/src/Resources/config/services/checker/voucher.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - + + diff --git a/src/Resources/config/services/cli.xml b/src/Resources/config/services/cli.xml index 7e1e8717..3574c534 100644 --- a/src/Resources/config/services/cli.xml +++ b/src/Resources/config/services/cli.xml @@ -5,19 +5,19 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd" > - - + + - - + + - - + + - + diff --git a/src/Resources/config/services/context.xml b/src/Resources/config/services/context.xml index 863f69e8..f1e25211 100644 --- a/src/Resources/config/services/context.xml +++ b/src/Resources/config/services/context.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/src/Resources/config/services/controller.xml b/src/Resources/config/services/controller.xml index eb54d4ea..7e634432 100644 --- a/src/Resources/config/services/controller.xml +++ b/src/Resources/config/services/controller.xml @@ -4,86 +4,86 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + - + - - - - - + + + + + - - - + + + - + - - + + - + - + - - + + - + - + - + - + - - - + + + - - - - + + + + - - - - + + - - + + - - - + + + - - + + diff --git a/src/Resources/config/services/creator.xml b/src/Resources/config/services/creator.xml index 2774105f..ebb7908f 100644 --- a/src/Resources/config/services/creator.xml +++ b/src/Resources/config/services/creator.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + @@ -12,38 +12,38 @@ - + - - + + - - + + - + - - + + - + - - + + - - + + - + - - + + diff --git a/src/Resources/config/services/distributor.xml b/src/Resources/config/services/distributor.xml index f67487dc..f302d740 100644 --- a/src/Resources/config/services/distributor.xml +++ b/src/Resources/config/services/distributor.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + diff --git a/src/Resources/config/services/documentation.xml b/src/Resources/config/services/documentation.xml index f41ecf67..51c254e3 100644 --- a/src/Resources/config/services/documentation.xml +++ b/src/Resources/config/services/documentation.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/src/Resources/config/services/email_sender/payment_link.xml b/src/Resources/config/services/email_sender/payment_link.xml index 7d55b7de..edd5da84 100644 --- a/src/Resources/config/services/email_sender/payment_link.xml +++ b/src/Resources/config/services/email_sender/payment_link.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/Resources/config/services/event_listener.xml b/src/Resources/config/services/event_listener.xml index 106c79d1..6800c770 100644 --- a/src/Resources/config/services/event_listener.xml +++ b/src/Resources/config/services/event_listener.xml @@ -4,36 +4,36 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - + + - + - + - - - + + + - + - + - + - + diff --git a/src/Resources/config/services/factory.xml b/src/Resources/config/services/factory.xml index 54aed0e0..8b7ec29f 100644 --- a/src/Resources/config/services/factory.xml +++ b/src/Resources/config/services/factory.xml @@ -4,42 +4,42 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - - + + + - - + + - + - + - - + + - - + + - - + + - - - - + + + + diff --git a/src/Resources/config/services/form.xml b/src/Resources/config/services/form.xml index f68e2b08..f14933ac 100644 --- a/src/Resources/config/services/form.xml +++ b/src/Resources/config/services/form.xml @@ -3,97 +3,96 @@ - + sylius - + sylius - + sylius - + sylius - - - + + + - - + + - - + + - + - + - + - - - + + - - - + + + - + - - %bitbag_sylius_mollie_plugin.model.mollie_gateway_config.class% - + + %sylius_mollie_plugin.model.mollie_gateway_config.class% + %sylius_locale.locale% - %bitbag_sylius_mollie_plugin.form.type.payment_methods.validation_groups.transport% + %sylius_mollie_plugin.form.type.payment_methods.validation_groups.transport% - - %bitbag_sylius_mollie_plugin.model.payment_surcharge_fee.class% - %bitbag_sylius_mollie_plugin.form.type.payment_methods.payment_surcharge_fee.validation_groups% + + %sylius_mollie_plugin.model.payment_surcharge_fee.class% + %sylius_mollie_plugin.form.type.payment_methods.payment_surcharge_fee.validation_groups% - - %bitbag_sylius_mollie_plugin.model.mollie_method_image.class% + + %sylius_mollie_plugin.model.mollie_method_image.class% - - + + - - + + - + %sylius.model.shipment.class% - %bitbag_sylius_mollie_plugin.form.type.partial_shipment.validation_groups% + %sylius_mollie_plugin.form.type.partial_shipment.validation_groups% - + - - %bitbag_sylius_mollie_plugin.model.product_type.class% - %bitbag_sylius_mollie_plugin.form.type.mollie.validation_groups% + + %sylius_mollie_plugin.model.product_type.class% + %sylius_mollie_plugin.form.type.mollie.validation_groups% - - %bitbag_sylius_mollie_plugin.model.template_mollie_email_translation.class% + + %sylius_mollie_plugin.model.template_mollie_email_translation.class% - - %bitbag_sylius_mollie_plugin.model.mollie_gateway_config_translation.class% + + %sylius_mollie_plugin.model.mollie_gateway_config_translation.class% diff --git a/src/Resources/config/services/gateway_factory.xml b/src/Resources/config/services/gateway_factory.xml index 7f5ca05b..d85c55e1 100644 --- a/src/Resources/config/services/gateway_factory.xml +++ b/src/Resources/config/services/gateway_factory.xml @@ -4,17 +4,17 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + - - + + - - + + diff --git a/src/Resources/config/services/generator.xml b/src/Resources/config/services/generator.xml index f7ce67fe..5e8dda66 100644 --- a/src/Resources/config/services/generator.xml +++ b/src/Resources/config/services/generator.xml @@ -6,9 +6,9 @@ > - - - + + + diff --git a/src/Resources/config/services/guard.xml b/src/Resources/config/services/guard.xml index 74505414..0fb314ea 100644 --- a/src/Resources/config/services/guard.xml +++ b/src/Resources/config/services/guard.xml @@ -6,6 +6,6 @@ > - + diff --git a/src/Resources/config/services/helper.xml b/src/Resources/config/services/helper.xml index 595b975e..9bfd37b3 100644 --- a/src/Resources/config/services/helper.xml +++ b/src/Resources/config/services/helper.xml @@ -4,26 +4,26 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + - - - - - - + + + + + + - + - - + + - + diff --git a/src/Resources/config/services/menu.xml b/src/Resources/config/services/menu.xml index 2b9b33ca..acd05374 100644 --- a/src/Resources/config/services/menu.xml +++ b/src/Resources/config/services/menu.xml @@ -3,16 +3,16 @@ - + - + - + - + diff --git a/src/Resources/config/services/methods.xml b/src/Resources/config/services/methods.xml index ca9fc663..1da41fec 100644 --- a/src/Resources/config/services/methods.xml +++ b/src/Resources/config/services/methods.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/src/Resources/config/services/methods_filter.xml b/src/Resources/config/services/methods_filter.xml index a955fdde..939c4fc9 100644 --- a/src/Resources/config/services/methods_filter.xml +++ b/src/Resources/config/services/methods_filter.xml @@ -5,7 +5,7 @@ + class="SyliusMolliePlugin\Payments\MethodResolver\MollieMethodFilter"> diff --git a/src/Resources/config/services/mollie.xml b/src/Resources/config/services/mollie.xml index 4fa01655..26fa42b7 100644 --- a/src/Resources/config/services/mollie.xml +++ b/src/Resources/config/services/mollie.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + - - - + + + - + diff --git a/src/Resources/config/services/order.xml b/src/Resources/config/services/order.xml index 240dc419..2bad1362 100644 --- a/src/Resources/config/services/order.xml +++ b/src/Resources/config/services/order.xml @@ -4,31 +4,31 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + - + - + - + - + - + - - + + - - + + diff --git a/src/Resources/config/services/parser.xml b/src/Resources/config/services/parser.xml index 56c0c005..fea3c0f4 100644 --- a/src/Resources/config/services/parser.xml +++ b/src/Resources/config/services/parser.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/src/Resources/config/services/partial_ship.xml b/src/Resources/config/services/partial_ship.xml index 1bea770a..e50cb096 100644 --- a/src/Resources/config/services/partial_ship.xml +++ b/src/Resources/config/services/partial_ship.xml @@ -3,10 +3,10 @@ - - + + - + diff --git a/src/Resources/config/services/payment_fee.xml b/src/Resources/config/services/payment_fee.xml index 93158e67..aa0bc43a 100644 --- a/src/Resources/config/services/payment_fee.xml +++ b/src/Resources/config/services/payment_fee.xml @@ -4,21 +4,21 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + - - + + - + - - - - + + + + diff --git a/src/Resources/config/services/payment_processing.xml b/src/Resources/config/services/payment_processing.xml index 3bd3cfff..23c7609c 100644 --- a/src/Resources/config/services/payment_processing.xml +++ b/src/Resources/config/services/payment_processing.xml @@ -4,12 +4,11 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + - - - + + diff --git a/src/Resources/config/services/payment_resolver.xml b/src/Resources/config/services/payment_resolver.xml index b66d5654..52a65754 100644 --- a/src/Resources/config/services/payment_resolver.xml +++ b/src/Resources/config/services/payment_resolver.xml @@ -5,13 +5,13 @@ - + - + diff --git a/src/Resources/config/services/preparer.xml b/src/Resources/config/services/preparer.xml index f4af3895..2fd18b16 100644 --- a/src/Resources/config/services/preparer.xml +++ b/src/Resources/config/services/preparer.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - - + + + diff --git a/src/Resources/config/services/processor/payment_fee.xml b/src/Resources/config/services/processor/payment_fee.xml index 488b5c97..f759cb1d 100644 --- a/src/Resources/config/services/processor/payment_fee.xml +++ b/src/Resources/config/services/processor/payment_fee.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - + + diff --git a/src/Resources/config/services/processor/subscription.xml b/src/Resources/config/services/processor/subscription.xml index 5548b69d..7bbefd37 100644 --- a/src/Resources/config/services/processor/subscription.xml +++ b/src/Resources/config/services/processor/subscription.xml @@ -4,18 +4,18 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - + + - - + + - - - + + + diff --git a/src/Resources/config/services/provider.xml b/src/Resources/config/services/provider.xml index c662eb11..cf4f1d3f 100644 --- a/src/Resources/config/services/provider.xml +++ b/src/Resources/config/services/provider.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - - - + + + + - + - + @@ -19,9 +19,9 @@ - - + + - + diff --git a/src/Resources/config/services/purifier.xml b/src/Resources/config/services/purifier.xml index d672607f..76354eeb 100644 --- a/src/Resources/config/services/purifier.xml +++ b/src/Resources/config/services/purifier.xml @@ -4,16 +4,16 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - + + - - - - + + + + - - + + diff --git a/src/Resources/config/services/refund.xml b/src/Resources/config/services/refund.xml index cf53f6dd..a83be119 100644 --- a/src/Resources/config/services/refund.xml +++ b/src/Resources/config/services/refund.xml @@ -4,35 +4,35 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - + + - + - + - - - - + + + + - + - - + + - + - + - + - + - + diff --git a/src/Resources/config/services/remover.xml b/src/Resources/config/services/remover.xml index 4fb3fe02..79a31bb2 100644 --- a/src/Resources/config/services/remover.xml +++ b/src/Resources/config/services/remover.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + diff --git a/src/Resources/config/services/repository/credit_memo.xml b/src/Resources/config/services/repository/credit_memo.xml index 44b2de18..3f4424fe 100644 --- a/src/Resources/config/services/repository/credit_memo.xml +++ b/src/Resources/config/services/repository/credit_memo.xml @@ -3,8 +3,8 @@ - diff --git a/src/Resources/config/services/resolver.xml b/src/Resources/config/services/resolver.xml index defc3acd..b4dcc851 100644 --- a/src/Resources/config/services/resolver.xml +++ b/src/Resources/config/services/resolver.xml @@ -4,105 +4,105 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - - - - - + + + + + - - - + + + - + %images_dir% - - + + - + - + - + - + - + - - - - + + + + - + - - + + - + - - - - + + + + - + - - + + - - + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - + + - + - - - + + + - - - - + + + + - - - + + + diff --git a/src/Resources/config/services/twig.xml b/src/Resources/config/services/twig.xml index c76fbc73..f40e98f2 100644 --- a/src/Resources/config/services/twig.xml +++ b/src/Resources/config/services/twig.xml @@ -3,26 +3,26 @@ - - bitbag_sylius_mollie_plugin_render_email_template + + sylius_mollie_plugin_render_email_template - + - %bitbag_sylius_mollie_plugin.twig.functions% + %sylius_mollie_plugin.twig.functions% - - + + - - + + diff --git a/src/Resources/config/services/updater.xml b/src/Resources/config/services/updater.xml index 6ca48944..a3c58976 100644 --- a/src/Resources/config/services/updater.xml +++ b/src/Resources/config/services/updater.xml @@ -4,10 +4,10 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + diff --git a/src/Resources/config/services/uploader/payment_method_logo_uploader.xml b/src/Resources/config/services/uploader/payment_method_logo_uploader.xml index df92dbbd..997203cd 100644 --- a/src/Resources/config/services/uploader/payment_method_logo_uploader.xml +++ b/src/Resources/config/services/uploader/payment_method_logo_uploader.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + %sylius.uploader.filesystem% diff --git a/src/Resources/config/services/validators.xml b/src/Resources/config/services/validators.xml index abb16266..a548ad6d 100644 --- a/src/Resources/config/services/validators.xml +++ b/src/Resources/config/services/validators.xml @@ -4,37 +4,37 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - + - + - + - - - + + + - + - + - + diff --git a/src/Resources/config/state_machine.yaml b/src/Resources/config/state_machine.yaml index b98f133e..a156174a 100644 --- a/src/Resources/config/state_machine.yaml +++ b/src/Resources/config/state_machine.yaml @@ -1,5 +1,5 @@ imports: - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/state_machine/checkout.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/state_machine/mollie_subscription.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/state_machine/mollie_subscription_manual.yaml" } - - { resource: "@BitBagSyliusMolliePlugin/Resources/config/state_machine/payment_mollie_subscription.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/state_machine/checkout.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/state_machine/mollie_subscription.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/state_machine/mollie_subscription_manual.yaml" } + - { resource: "@SyliusMolliePlugin/Resources/config/state_machine/payment_mollie_subscription.yaml" } diff --git a/src/Resources/config/state_machine/checkout.yaml b/src/Resources/config/state_machine/checkout.yaml index 9e623b72..e8cbe394 100644 --- a/src/Resources/config/state_machine/checkout.yaml +++ b/src/Resources/config/state_machine/checkout.yaml @@ -2,9 +2,9 @@ winzou_state_machine: sylius_order_checkout: callbacks: after: - bitbag_sylius_mollie_plugin_payment_surcharge: + sylius_mollie_plugin_payment_surcharge: on: ["select_payment"] - do: ["@bitbag_sylius_mollie_plugin.processor.payment_surcharge_processor", "process"] + do: ["@sylius_mollie_plugin.processor.payment_surcharge_processor", "process"] args: ["object"] sylius_shipment: transitions: @@ -13,9 +13,9 @@ winzou_state_machine: to: shipped callbacks: before: - bitbag_purify_empty_ready_shipments: + mollie_purify_empty_ready_shipments: on: ["ship", "create_and_ship"] - do: ["@bitbag_sylius_mollie_plugin.purifier.partial_ship.order_shipment_purifier", "purify"] + do: ["@sylius_mollie_plugin.purifier.partial_ship.order_shipment_purifier", "purify"] args: ["object.getOrder()"] after: sylius_resolve_state: diff --git a/src/Resources/config/state_machine/mollie_subscription.yaml b/src/Resources/config/state_machine/mollie_subscription.yaml index 773236a6..64475163 100644 --- a/src/Resources/config/state_machine/mollie_subscription.yaml +++ b/src/Resources/config/state_machine/mollie_subscription.yaml @@ -1,6 +1,6 @@ winzou_state_machine: mollie_subscription: - class: "%bitbag_sylius_mollie_plugin.model.mollie_subscription.class%" + class: "%sylius_mollie_plugin.model.mollie_subscription.class%" property_path: state graph: mollie_subscription_graph state_machine_class: "%sylius.state_machine.class%" @@ -33,22 +33,22 @@ winzou_state_machine: to: aborted callbacks: guard: - bitbag_sylius_mollie_plugin_activate_recurring_subscription_guard_for_complete: + sylius_mollie_plugin_activate_recurring_subscription_guard_for_complete: on: 'complete' - do: [ '@bitbag_sylius_mollie_plugin.guard.subscription', 'isCompletable' ] + do: [ '@sylius_mollie_plugin.guard.subscription', 'isCompletable' ] args: [ 'object' ] - bitbag_sylius_mollie_plugin_activate_recurring_subscription_guard_for_abort: + sylius_mollie_plugin_activate_recurring_subscription_guard_for_abort: on: 'abort' - do: [ '@bitbag_sylius_mollie_plugin.guard.subscription', 'isEligibleForPaymentsAbort' ] + do: [ '@sylius_mollie_plugin.guard.subscription', 'isEligibleForPaymentsAbort' ] args: [ 'object' ] after: - bitbag_sylius_mollie_plugin_activate_recurring_subscription_process: + sylius_mollie_plugin_activate_recurring_subscription_process: on: ["activate"] - do: ["@bitbag_sylius_mollie_plugin.processor.subscription_schedule_processor", "processScheduleGeneration"] + do: ["@sylius_mollie_plugin.processor.subscription_schedule_processor", "processScheduleGeneration"] args: ["object"] mollie_subscription_processing: - class: "%bitbag_sylius_mollie_plugin.model.mollie_subscription.class%" + class: "%sylius_mollie_plugin.model.mollie_subscription.class%" property_path: processingState graph: mollie_subscription_processing_graph state_machine_class: "%sylius.state_machine.class%" diff --git a/src/Resources/config/state_machine/mollie_subscription_manual.yaml b/src/Resources/config/state_machine/mollie_subscription_manual.yaml index c78051bd..ac352945 100644 --- a/src/Resources/config/state_machine/mollie_subscription_manual.yaml +++ b/src/Resources/config/state_machine/mollie_subscription_manual.yaml @@ -1,6 +1,6 @@ winzou_state_machine: - bitbag_mollie_subscription_manual: - class: "%bitbag_sylius_mollie_plugin.model.mollie_subscription.class%" + mollie_subscription_manual: + class: "%sylius_mollie_plugin.model.mollie_subscription.class%" property_path: state graph: mollie_subscription_payment_graph_manual state_machine_class: "%sylius.state_machine.class%" diff --git a/src/Resources/config/state_machine/payment_mollie_subscription.yaml b/src/Resources/config/state_machine/payment_mollie_subscription.yaml index e2819089..0d386355 100644 --- a/src/Resources/config/state_machine/payment_mollie_subscription.yaml +++ b/src/Resources/config/state_machine/payment_mollie_subscription.yaml @@ -4,16 +4,16 @@ winzou_state_machine: after: sylius_process_subscription_fail: on: [ "fail" ] - do: [ "@bitbag_sylius_mollie_plugin.payment_processing.subscription_payment_processor", "processFailed" ] + do: [ "@sylius_mollie_plugin.payment_processing.subscription_payment_processor", "processFailed" ] args: [ "object" ] sylius_process_subscription_success: on: [ "complete" ] - do: [ "@bitbag_sylius_mollie_plugin.payment_processing.subscription_payment_processor", "processSuccess" ] + do: [ "@sylius_mollie_plugin.payment_processing.subscription_payment_processor", "processSuccess" ] args: [ "object" ] - bitbag_mollie_subscription_manual: - class: "%bitbag_sylius_mollie_plugin.model.mollie_subscription.class%" + mollie_subscription_manual: + class: "%sylius_mollie_plugin.model.mollie_subscription.class%" property_path: state graph: mollie_subscription_payment_graph_manual state_machine_class: "%sylius.state_machine.class%" @@ -37,7 +37,7 @@ winzou_state_machine: to: canceled mollie_subscription_payment_state_graph: - class: "%bitbag_sylius_mollie_plugin.model.mollie_subscription.class%" + class: "%sylius_mollie_plugin.model.mollie_subscription.class%" property_path: paymentState graph: mollie_subscription_payment_state_graph state_machine_class: "%sylius.state_machine.class%" @@ -59,5 +59,5 @@ winzou_state_machine: before: mollie_subscription_payment_state_after_success: on: [ "success" ] - do: [ "@bitbag_sylius_mollie_plugin.processor.subscription_schedule_processor", "process" ] + do: [ "@sylius_mollie_plugin.processor.subscription_schedule_processor", "process" ] args: [ "object" ] diff --git a/src/Resources/config/ui/cart_recurring_variants.yaml b/src/Resources/config/ui/cart_recurring_variants.yaml index 5c866d1b..5d4ae62a 100644 --- a/src/Resources/config/ui/cart_recurring_variants.yaml +++ b/src/Resources/config/ui/cart_recurring_variants.yaml @@ -3,10 +3,10 @@ sylius_ui: sylius.shop.cart.items: blocks: cart_items_details: - template: "@BitBagSyliusMolliePlugin/Shop/Cart/_productVariantsDetails.html.twig" + template: "@SyliusMolliePlugin/Shop/Cart/_productVariantsDetails.html.twig" priority: -10 sylius.shop.checkout.complete.summary: blocks: cart_items_details: - template: "@BitBagSyliusMolliePlugin/Shop/Summary/_productVariantsDetails.html.twig" + template: "@SyliusMolliePlugin/Shop/Summary/_productVariantsDetails.html.twig" priority: -10 diff --git a/src/Resources/config/ui/mollie_subscription.yaml b/src/Resources/config/ui/mollie_subscription.yaml index f744e69b..c3342536 100644 --- a/src/Resources/config/ui/mollie_subscription.yaml +++ b/src/Resources/config/ui/mollie_subscription.yaml @@ -1,113 +1,113 @@ sylius_ui: events: - bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.content: + sylius_mollie_plugin_mollie.admin.mollie_subscription.show.content: blocks: before_header_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 35 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.before_header + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.before_header header: - template: "@BitBagSyliusMolliePlugin/Admin/MollieSubscription/Show/_headerWidget.html.twig" + template: "@SyliusMolliePlugin/Admin/MollieSubscription/Show/_headerWidget.html.twig" priority: 30 after_header_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 25 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.after_header + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.after_header breadcrumb: - template: "@BitBagSyliusMolliePlugin/Admin/MollieSubscription/Show/_breadcrumb.html.twig" + template: "@SyliusMolliePlugin/Admin/MollieSubscription/Show/_breadcrumb.html.twig" priority: 20 after_breadcrumb_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 15 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.after_breadcrumb + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.after_breadcrumb content: - template: "@BitBagSyliusMolliePlugin/Admin/MollieSubscription/Show/_content.html.twig" + template: "@SyliusMolliePlugin/Admin/MollieSubscription/Show/_content.html.twig" priority: 10 after_content_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 5 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.after_content + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.after_content - bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents: + sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents: blocks: before_contents_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 100 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.before_contents + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.before_contents before_orders_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 95 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.before_orders + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.before_orders orders: - template: "@BitBagSyliusMolliePlugin/Admin/MollieSubscription/Show/_ordersWidget.html.twig" + template: "@SyliusMolliePlugin/Admin/MollieSubscription/Show/_ordersWidget.html.twig" priority: 90 after_orders_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 85 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.after_orders + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.after_orders before_payments_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 80 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.before_payments + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.before_payments payments: - template: "@BitBagSyliusMolliePlugin/Admin/MollieSubscription/Show/_paymentsWidget.html.twig" + template: "@SyliusMolliePlugin/Admin/MollieSubscription/Show/_paymentsWidget.html.twig" priority: 75 after_payments_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 70 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.after_payments + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.after_payments before_subscription_contents_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 65 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.before_subscription_contents + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.before_subscription_contents subscription_contents: - template: "@BitBagSyliusMolliePlugin/Admin/MollieSubscription/Show/_subscriptionContentsWidget.html.twig" + template: "@SyliusMolliePlugin/Admin/MollieSubscription/Show/_subscriptionContentsWidget.html.twig" priority: 60 after_subscription_contents_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 55 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.after_subscription_contents + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.after_subscription_contents before_subscription_schedule_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 50 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.before_subscription_schedule_legacy + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.before_subscription_schedule_legacy subscription_schedule: - template: "@BitBagSyliusMolliePlugin/Admin/MollieSubscription/Show/_subscriptionScheduleWidget.html.twig" + template: "@SyliusMolliePlugin/Admin/MollieSubscription/Show/_subscriptionScheduleWidget.html.twig" priority: 45 after_subscription_schedule_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 40 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.after_subscription_schedule_legacy + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.after_subscription_schedule_legacy after_contents_legacy: template: "@SyliusUi/Block/_legacySonataEvent.html.twig" priority: 0 context: - event: bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.after_contents + event: sylius_mollie_plugin_mollie.admin.mollie_subscription.show.contents.after_contents - bitbag_sylius_mollie_plugin_mollie.admin.mollie_subscription.show.sidebar: + sylius_mollie_plugin_mollie.admin.mollie_subscription.show.sidebar: blocks: payments: - template: "@BitBagSyliusMolliePlugin/Admin/MollieSubscription/Show/_sidebarPayments.html.twig" + template: "@SyliusMolliePlugin/Admin/MollieSubscription/Show/_sidebarPayments.html.twig" priority: 30 transitions: - template: "@BitBagSyliusMolliePlugin/Admin/MollieSubscription/Show/_sidebarTransitions.html.twig" + template: "@SyliusMolliePlugin/Admin/MollieSubscription/Show/_sidebarTransitions.html.twig" priority: 30 diff --git a/src/Resources/config/ui/product_variants_recurring.yaml b/src/Resources/config/ui/product_variants_recurring.yaml index cebc77ce..35c803d1 100644 --- a/src/Resources/config/ui/product_variants_recurring.yaml +++ b/src/Resources/config/ui/product_variants_recurring.yaml @@ -3,5 +3,5 @@ sylius_ui: sylius.shop.product.show.right_sidebar: blocks: variant_recurring_state: - template: "@BitBagSyliusMolliePlugin/Shop/Product/_variantRecurringContainer.html.twig" + template: "@SyliusMolliePlugin/Shop/Product/_variantRecurringContainer.html.twig" priority: -10 diff --git a/src/Resources/config/validation/MollieGatewayConfig.xml b/src/Resources/config/validation/MollieGatewayConfig.xml index ef889949..756b726d 100644 --- a/src/Resources/config/validation/MollieGatewayConfig.xml +++ b/src/Resources/config/validation/MollieGatewayConfig.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping https://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"> - + diff --git a/src/Resources/config/validation/MollieGatewayConfigTranslation.xml b/src/Resources/config/validation/MollieGatewayConfigTranslation.xml index 9f6bc834..1c4a16ee 100644 --- a/src/Resources/config/validation/MollieGatewayConfigTranslation.xml +++ b/src/Resources/config/validation/MollieGatewayConfigTranslation.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping https://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"> - +