MDL-52207 libraries: Delete Zend framework

Let it RIP.

diff --git a/install.php b/install.php
index 0f65755..5fc031b 100644 (file)
--- a/install.php
+++ b/install.php
@@ -217,8 +217,6 @@ require_once($CFG->dirroot.'/cache/lib.php');
 //point pear include path to moodles lib/pear so that includes and requires will search there for files before anywhere else
 //the problem is that we need specific version of quickforms and hacked excel files :-(
 ini_set('include_path', $CFG->libdir.'/pear' . PATH_SEPARATOR . ini_get('include_path'));
-//point zend include path to moodles lib/zend so that includes and requires will search there for files before anywhere else
-ini_set('include_path', $CFG->libdir.'/zend' . PATH_SEPARATOR . ini_get('include_path'));
 
 // Register our classloader, in theory somebody might want to replace it to load other hacked core classes.
 // Required because the database checks below lead to session interaction which is going to lead us to requiring autoloaded classes.

diff --git a/lib/setup.php b/lib/setup.php
index 4c5930b..71b37ad 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -572,9 +572,6 @@ if (!empty($_SERVER['HTTP_X_moz']) && $_SERVER['HTTP_X_moz'] === 'prefetch'){
 //point pear include path to moodles lib/pear so that includes and requires will search there for files before anywhere else
 //the problem is that we need specific version of quickforms and hacked excel files :-(
 ini_set('include_path', $CFG->libdir.'/pear' . PATH_SEPARATOR . ini_get('include_path'));
-//point zend include path to moodles lib/zend so that includes and requires will search there for files before anywhere else
-//please note zend library is supposed to be used only from web service protocol classes, it may be removed in future
-ini_set('include_path', $CFG->libdir.'/zend' . PATH_SEPARATOR . ini_get('include_path'));
 
 // Register our classloader, in theory somebody might want to replace it to load other hacked core classes.
 if (defined('COMPONENT_CLASSLOADER')) {

diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
index fc8ffe0..a522125 100644 (file)
--- a/lib/thirdpartylibs.xml
+++ b/lib/thirdpartylibs.xml
@@ -196,13 +196,6 @@
     <version>1.11.4</version>
     <licenseversion></licenseversion>
   </library>
-  <library>
-    <location>zend</location>
-    <name>Zend Framework</name>
-    <license>BSD</license>
-    <version>1.12.16</version>
-    <licenseversion></licenseversion>
-  </library>
   <library>
     <location>html2text.php</location>
     <name>HTML2Text</name>

diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index a88c602..5135ad3 100644 (file)
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -84,6 +84,7 @@ information provided here is intended especially for developers.
 * \repository::antivir_scan_file() has been deprecated, \core\antivirus\manager::scan_file() that
   applies antivirus plugins is replacing its functionality.
 * Added core_text::str_max_bytes() which safely truncates multi-byte strings to a maximum number of bytes.
+* Zend Framework has been removed completely.
 
 === 3.0 ===
 

diff --git a/lib/zend/Zend/Acl.php b/lib/zend/Zend/Acl.php
deleted file mode 100644 (file)
index a5d169f..0000000
--- a/lib/zend/Zend/Acl.php
+++ /dev/null
@@ -1,1242 +0,0 @@
-<?php
-/**
- * Zend Framework
- *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@zend.com so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
- */
-
-
-/**
- * @see Zend_Acl_Resource_Interface
- */
-require_once 'Zend/Acl/Resource/Interface.php';
-
-
-/**
- * @see Zend_Acl_Role_Registry
- */
-require_once 'Zend/Acl/Role/Registry.php';
-
-
-/**
- * @see Zend_Acl_Assert_Interface
- */
-require_once 'Zend/Acl/Assert/Interface.php';
-
-
-/**
- * @see Zend_Acl_Role
- */
-require_once 'Zend/Acl/Role.php';
-
-
-/**
- * @see Zend_Acl_Resource
- */
-require_once 'Zend/Acl/Resource.php';
-
-
-/**
- * @category   Zend
- * @package    Zend_Acl
- * @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
- */
-class Zend_Acl
-{
-    /**
-     * Rule type: allow
-     */
-    const TYPE_ALLOW = 'TYPE_ALLOW';
-
-    /**
-     * Rule type: deny
-     */
-    const TYPE_DENY  = 'TYPE_DENY';
-
-    /**
-     * Rule operation: add
-     */
-    const OP_ADD = 'OP_ADD';
-
-    /**
-     * Rule operation: remove
-     */
-    const OP_REMOVE = 'OP_REMOVE';
-
-    /**
-     * Role registry
-     *
-     * @var Zend_Acl_Role_Registry
-     */
-    protected $_roleRegistry = null;
-
-    /**
-     * Resource tree
-     *
-     * @var array
-     */
-    protected $_resources = array();
-
-    /**
-     * @var Zend_Acl_Role_Interface
-     */
-    protected $_isAllowedRole     = null;
-
-    /**
-     * @var Zend_Acl_Resource_Interface
-     */
-    protected $_isAllowedResource = null;
-
-    /**
-     * @var String
-     */
-    protected $_isAllowedPrivilege = null;
-
-    /**
-     * ACL rules; whitelist (deny everything to all) by default
-     *
-     * @var array
-     */
-    protected $_rules = array(
-        'allResources' => array(
-            'allRoles' => array(
-                'allPrivileges' => array(
-                    'type'   => self::TYPE_DENY,
-                    'assert' => null
-                    ),
-                'byPrivilegeId' => array()
-                ),
-            'byRoleId' => array()
-            ),
-        'byResourceId' => array()
-        );
-
-    /**
-     * Adds a Role having an identifier unique to the registry
-     *
-     * The $parents parameter may be a reference to, or the string identifier for,
-     * a Role existing in the registry, or $parents may be passed as an array of
-     * these - mixing string identifiers and objects is ok - to indicate&nb