From b1b4eb91e72b4ea9ce0b7d100d8b1e08b88dc213 Mon Sep 17 00:00:00 2001
From: Igor Melnikov <imelnikov@ebay.com>
Date: Wed, 23 Mar 2016 16:05:26 -0500
Subject: [PATCH 1/2] MAGETWO-50795: Move CatalogImportExportStaging to EE

Removing app/code/Magento/CatalogImportExportStaging/Observer/DeleteSequenceObserver.php
---
 .../Observer/DeleteSequenceObserver.php       | 41 -------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 app/code/Magento/CatalogImportExportStaging/Observer/DeleteSequenceObserver.php

diff --git a/app/code/Magento/CatalogImportExportStaging/Observer/DeleteSequenceObserver.php b/app/code/Magento/CatalogImportExportStaging/Observer/DeleteSequenceObserver.php
deleted file mode 100644
index 2f28236135311..0000000000000
--- a/app/code/Magento/CatalogImportExportStaging/Observer/DeleteSequenceObserver.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\CatalogImportExportStaging\Observer;
-
-use Magento\Framework\Event\ObserverInterface;
-use Magento\CatalogStaging\Model\ResourceModel\ProductSequence\Collection;
-
-class DeleteSequenceObserver implements ObserverInterface
-{
-    /**
-     * @var Collection
-     */
-    private $productSequenceCollection;
-
-    /**
-     * Constructor
-     *
-     * @param Collection $productSequenceCollection
-     */
-    public function __construct(
-        Collection $productSequenceCollection
-    ) {
-        $this->productSequenceCollection = $productSequenceCollection;
-    }
-
-    /**
-     * Delete sequence
-     *
-     * @param \Magento\Framework\Event\Observer $observer
-     * @return void
-     * @throws \LogicException
-     */
-    public function execute(\Magento\Framework\Event\Observer $observer)
-    {
-        $ids = $observer->getIdsToDelete();
-        $this->productSequenceCollection->deleteSequence($ids);
-    }
-}

From 1873b456d3b579a96e9082b5fc721a366cecf04e Mon Sep 17 00:00:00 2001
From: Dale Sikkema <dsikkema@ebay.com>
Date: Wed, 23 Mar 2016 19:51:00 -0500
Subject: [PATCH 2/2] MAGETWO-50788: setup:di:compile fails with exception

---
 .htaccess         |  6 ++++++
 app/bootstrap.php |  4 ++++
 pub/.htaccess     | 11 +++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.htaccess b/.htaccess
index f73472fb4994e..6aaf8dd821660 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,6 +4,12 @@
 
 #   SetEnv MAGE_MODE developer
 
+############################################
+## overrides default umask value to allow using different
+## file permissions
+
+#   SetEnv MAGE_UMASK 022
+
 ############################################
 ## uncomment these lines for CGI mode
 ## make sure to specify the correct cgi php binary file name
diff --git a/app/bootstrap.php b/app/bootstrap.php
index 51fe7bf3cd90e..ae15b1ad4c0c2 100644
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -10,6 +10,10 @@
 error_reporting(E_ALL);
 #ini_set('display_errors', 1);
 
+/* Custom umask value may be provided in MAGE_UMASK environment variable */
+$mask = isset($_SERVER['MAGE_UMASK']) ? octdec($_SERVER['MAGE_UMASK']) : 002;
+umask($mask);
+
 /* PHP version validation */
 if (version_compare(phpversion(), '5.5.0', '<') === true) {
     if (PHP_SAPI == 'cli') {
diff --git a/pub/.htaccess b/pub/.htaccess
index 087064b0373c8..2e1bb6ab56816 100644
--- a/pub/.htaccess
+++ b/pub/.htaccess
@@ -1,8 +1,15 @@
 ############################################
-## uncomment the line below to enable developer mode
+## overrides deployment configuration mode value
+## use command bin/magento deploy:mode:set to switch modes
 
 #   SetEnv MAGE_MODE developer
 
+############################################
+## overrides default umask value to allow using different
+## file permissions
+
+#   SetEnv MAGE_UMASK 022
+
 ############################################
 ## uncomment these lines for CGI mode
 ## make sure to specify the correct cgi php binary file name
@@ -213,4 +220,4 @@
     ############################################
     ## prevent clickjacking
     Header set X-Frame-Options SAMEORIGIN
-</IfModule>
\ No newline at end of file
+</IfModule>