barryvdh

diff --git a/vendor/magento/module-email/Model/Template/Filter.php b/vendor/magento/module-email/Model/Template/Filter.php
index 1a7c3683820a..586cb485ee1f 100644
--- a/vendor/magento/module-email/Model/Template/Filter.php
+++ b/vendor/magento/module-email/Model/Template/Filter.php
@@ -618,6 +618,12 @@ public function transDirective($construction)
         }
 
         $text = __($text, $params)->render();
+
+        $pattern = '/{{.*?}}/';

barryvdh

# See https://www.elastic.co/guide/en/elasticsearch/reference/current/deb.html

echo ">> Import the Elasticsearch PGP  Key"
wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add -

echo ">> Installing from the APT Repository"
echo "deb https://artifacts.elastic.co/packages/7.x/apt stable main" | sudo tee /etc/apt/sources.list.d/elastic-7.x.list
apt-get update && apt-get -y install elasticsearch

echo ">> Configure Elasticsearch to startup"

barryvdh

<?php

namespace App\Http\Client;

use GuzzleHttp\Promise;
use Illuminate\Http\Client\Events\ConnectionFailed;
use Illuminate\Http\Client\Events\RequestSending;
use Illuminate\Http\Client\Events\ResponseReceived;
use Illuminate\Http\Client\Request;
use Illuminate\Http\Client\Response;

barryvdh

<?php

namespace App\Services;

use Carbon\Carbon;
use Closure;
use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\HandlerStack;
use GuzzleHttp\Promise;
use Illuminate\Http\Client\Events\ConnectionFailed;

barryvdh

echo ">> Follow install based on https://docs.docker.com/engine/install/ubuntu/"
echo ">> Update the apt package index and install packages to allow apt to use a repository over HTTPS:"
apt-get update

apt-get -y install \
    apt-transport-https \
    ca-certificates \
    curl \
    gnupg \
    lsb-release

barryvdh

image: smartapps/bitbucket-pipelines-debian-10

pipelines:
  branches:
    master:
      - step:
          name: Deploy Test
          deployment: test
          script:
            - composer install --no-interaction --no-progress --prefer-dist

barryvdh

diff --git a/DB/Adapter/Pdo/Mysql.php b/DB/Adapter/Pdo/Mysql.php
index 1449d6d..38085a3 100644
--- a/DB/Adapter/Pdo/Mysql.php
+++ b/DB/Adapter/Pdo/Mysql.php
@@ -2904,7 +2904,7 @@ class Mysql extends \Zend_Db_Adapter_Pdo_Mysql implements AdapterInterface
                 if (isset($condition['to'])) {
                     $query .= empty($query) ? '' : ' AND ';
                     $to     = $this->_prepareSqlDateCondition($condition, 'to');
-                    $query = $this->_prepareQuotedSqlCondition($query . $conditionKeyMap['to'], $to, $fieldName);
+                    $query = $query . $this->_prepareQuotedSqlCondition($conditionKeyMap['to'], $to, $fieldName);

barryvdh

  "require-dev": {
      "barryvdh/laravel-debugbar": "^3",
      "barryvdh/laravel-ide-helper": "^2.4",
      "filp/whoops": "~2.0",
      "mockery/mockery": "^1.0",
      "nikic/php-parser": "^4.0",
      "nunomaduro/collision": "^1.0",
      "phpro/grumphp": "^0.14.2",
      "phpunit/phpunit": "~7.0",
      "sensiolabs/security-checker": "^5.0",

barryvdh

# Rewrite the WS requests
RewriteCond %{REQUEST_URI}  ^/socket.io            [NC]
RewriteCond %{QUERY_STRING} transport=websocket    [NC]
RewriteRule /(.*)           ws://localhost:6001/$1 [P,L]

# Rewrite the HTTP requests
ProxyPass        /socket.io http://localhost:6001/socket.io
ProxyPassReverse /socket.io http://localhost:6001/socket.io

# For API requests

barryvdh

<?php

namespace App\Libraries\Queue;

use Illuminate\Events\Dispatcher;
use Illuminate\Queue\DatabaseQueue;
use Illuminate\Support\Str;
use Laravel\Horizon\Events\JobDeleted;
use Laravel\Horizon\Events\JobPushed;
use Laravel\Horizon\Events\JobReleased;