Merge branch 'feature/remove-deprecated-code' into develop

Author: smichaelsen

classes/Authentication/BaseCryptCookieSession.php

@@ -96,12 +96,4 @@ public function clearAll() {
     $this->encodeCryptCookie();
   }
 
-  /**
-   * @return BaseSessionInterface
-   * @deprecated Since 1.4, Removal: 1.5, Reason: Use ->clearAll() instead
-   */
-  public function clear_all() {
-    $this->clearAll();
-  }
-
 }

classes/Authentication/BaseHttpAuthentication.php

@@ -55,12 +55,4 @@ protected function isAuthenticated() {
         sha1($this->password) === $httpAuthentication[$this->name];
   }
 
-  /**
-   * @throws \Exception
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->checkAuthentication() instead
-   */
-  public function check_authentication() {
-    $this->checkAuthentication();
-  }
-
 }

classes/Authentication/BasePHPSession.php

@@ -71,12 +71,4 @@ public function clearAll() {
     return $this;
   }
 
-  /**
-   * @return BasePHPSession
-   * @deprecated Since 1.4, Removal: 1.5, Reason: Use ->clearAll() instead
-   */
-  public function clear_all() {
-    $this->clearAll();
-  }
-
 }

classes/Configuration/Configuration.php

@@ -84,21 +84,4 @@ public static function reset() {
     self::$configuration = [];
   }
 
-  /**
-   * @param string $section
-   * @param string $key
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->remove() instead
-   */
-  public static function remove_key($section, $key) {
-    self::remove($section, $key);
-  }
-
-  /**
-   * @param string $section
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->removeSection() instead
-   */
-  public static function remove_section($section) {
-    self::removeSection($section);
-  }
-
 }

classes/Domain/Collection/AbstractModelCollection.php

@@ -91,29 +91,4 @@ public function count() {
     return count($this->items);
   }
 
-  /**
-   * @param $id
-   * @return AbstractModel
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->getById() instead
-   */
-  public function get_by_id($id) {
-    return $this->getById($id);
-  }
-
-  /**
-   * @param AbstractModel $model
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->add() instead
-   */
-  public function set_item(AbstractModel $model) {
-    $this->add($model);
-  }
-
-  /**
-   * @param AbstractModel $model
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->remove() instead
-   */
-  public function remove_item(AbstractModel $model) {
-    $this->remove($model);
-  }
-
 }

classes/Domain/Repository/AbstractDomainRepository.php

@@ -153,48 +153,4 @@ protected function createIdentityModel($id) {
     return $model;
   }
 
-  /**
-   * @param int $id
-   * @return AbstractModel
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->findById() instead
-   */
-  public function find_by_id($id) {
-    return $this->findById($id);
-  }
-
-  /**
-   * @return AbstractModelCollection
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->findAll() instead
-   */
-  public function find_all() {
-    return $this->findAll();
-  }
-
-  /**
-   * @param array $where
-   * @return AbstractModel
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->queryOne() instead
-   */
-  protected function query_one($where = NULL) {
-    return $this->queryOne($where);
-  }
-
-  /**
-   * @param array $where
-   * @return AbstractModelCollection
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->queryMany() instead
-   */
-  protected function query_many($where = NULL) {
-    return $this->queryMany($where);
-  }
-
-  /**
-   * @param int $id
-   * @return AbstractModel
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->createIdentityModel() instead
-   */
-  protected function create_identity_model($id) {
-    return $this->createIdentityModel($id);
-  }
-
 }

classes/Mvc/AbstractController.php

@@ -25,12 +25,6 @@ abstract class AbstractController {
    */
   protected $response;
 
-  /**
-   * @var bool
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->requireHttpAuthentication instead
-   */
-  protected $require_http_authentication = NULL;
-
   /**
    * @var bool
    */
@@ -41,11 +35,6 @@ abstract class AbstractController {
    * @param AbstractView $response
    */
   public function __construct(Request $request, AbstractView $response) {
-    /** @noinspection PhpDeprecationInspection */
-    if ($this->require_http_authentication !== NULL) {
-      /** @noinspection PhpDeprecationInspection */
-      $this->requireHttpAuthentication = $this->require_http_authentication;
-    }
     SignalSlotDispatcher::emitSignal(self::SIGNAL_INIT_REQUEST, $request);
     SignalSlotDispatcher::emitSignal(self::SIGNAL_INIT_RESPONSE, $response);
     $this->request = $request;
@@ -104,12 +93,4 @@ public function getTemplateName($defaultTemplateName) {
     return $defaultTemplateName;
   }
 
-  /**
-   * @throws \Exception
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->handleNotSupportedMethod() instead
-   */
-  public function handle_not_supported_method() {
-    $this->handleNotSupportedMethod();
-  }
-
 }

classes/Mvc/Dispatcher.php

@@ -152,12 +152,4 @@ protected function dispatchController(Router $router) {
     return $output;
   }
 
-  /**
-   * @return string
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->getRequestMethod() instead
-   */
-  public function get_request_method() {
-    return $this->getRequestMethod();
-  }
-
 }

classes/Mvc/HttpStatus.php

@@ -90,29 +90,4 @@ public static function sendHeaders() {
     self::$additionalHeaders = [];
   }
 
-  /**
-   * @param int $code
-   * @param string $options
-   * @throws \Exception
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->setStatus() instead
-   */
-  public static function set_status($code, $options = NULL) {
-    self::setStatus($code, $options);
-  }
-
-  /**
-   * @return int
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->getStatus() instead
-   */
-  public static function get_status() {
-    return self::getStatus();
-  }
-
-  /**
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->sendHeaders() instead
-   */
-  public static function send_headers() {
-    self::sendHeaders();
-  }
-
 }

classes/Mvc/Router.php

@@ -110,20 +110,4 @@ protected function enhanceRegex($regex) {
     return $regex;
   }
 
-  /**
-   * @return array
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->getParameters() instead
-   */
-  public function get_parameters() {
-    return $this->getParameters();
-  }
-
-  /**
-   * @return mixed
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: use ->getResponder() instead
-   */
-  public function get_responder() {
-    return $this->getResponder();
-  }
-
 }

classes/Mvc/View/AbstractView.php

@@ -172,23 +172,4 @@ protected function getTemplateEnvironment($template_name = NULL) {
     return $template;
   }
 
-  /**
-   * @param string $templateName
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->setTemplateName() instead
-   */
-  public function set_template_name($templateName) {
-    $this->setTemplateName($templateName);
-  }
-
-  /**
-   * Sends an json encoded object to the browser using correct content type
-   *
-   * @param mixed $object Object (most likely an array) to json encode
-   * @param string $callback If set to string answer will be sent as JSONP output with this function
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->jsonOutput() instead
-   */
-  public function json_output($object, $callback = NULL) {
-    $this->jsonOutput($object, $callback);
-  }
-
 }

classes/Mvc/View/TwigView.php

@@ -81,44 +81,4 @@ public function hasOutputFunction($name) {
     return $this->getRenderingEngine()->getFunction($name) instanceof \Twig_SimpleFunction;
   }
 
-  /**
-   * @param string $name Name of the filter to use in the template
-   * @param mixed $function Name of the function to execute for the value from the template
-   * @param bool $htmlEscape
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->addOutputFilter() instead
-   */
-  public function add_output_filter($name, $function, $htmlEscape = FALSE) {
-    $this->addOutputFilter($name, $function, $htmlEscape);
-  }
-
-  /**
-   * @param string $name
-   * @return bool
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->hasOutputFilter() instead
-   */
-  public function has_output_filter($name) {
-    return $this->hasOutputFilter($name);
-  }
-
-  /**
-   * Adds a function to use in the template
-   *
-   * @param string $name string Name of the function to use in the template
-   * @param mixed $function string Name of the function to execute for the value from the template
-   * @param bool $htmlEscape
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->addOutputFunction() instead
-   */
-  public function add_output_function($name, $function, $htmlEscape = FALSE) {
-    $this->addOutputFunction($name, $function, $htmlEscape);
-  }
-
-  /**
-   * @param string $name
-   * @return bool
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->hasOutputFunction() instead
-   */
-  public function has_output_function($name) {
-    return $this->hasOutputFunction($name);
-  }
-
 }

classes/Orm/EntityMapper.php

@@ -63,32 +63,4 @@ public function scalarizeValue($value) {
     return (string) $value;
   }
 
-  /**
-   * @param array $record
-   * @param AbstractModel $object
-   * @return AbstractModel
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->recordToObject() instead
-   */
-  public function record_to_object($record, AbstractModel $object) {
-    return $this->recordToObject($record, $object);
-  }
-
-  /**
-   * @param AbstractModel $object
-   * @return array
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->objectToRecord() instead
-   */
-  public function object_to_record(AbstractModel $object) {
-    return $this->objectToRecord($object);
-  }
-
-  /**
-   * @param mixed $value
-   * @return string
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->scalarizeValue() instead
-   */
-  public function scalarize_value($value) {
-    return $this->scalarizeValue($value);
-  }
-
 }

classes/Persistence/DatabaseConnection.php

@@ -446,24 +446,4 @@ protected function whereSingleValue($value, $queryMode, $field) {
     return sprintf('`%s` %s %s', $field, $operand, $value);
   }
 
-  /**
-   * Checks whether the connection to the database is established
-   *
-   * @return bool
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->isConnected() instead
-   */
-  public function is_connected() {
-    return $this->isConnected();
-  }
-
-  /**
-   * Returns the auto increment ID of the last query
-   *
-   * @return int
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->lastId() instead
-   */
-  public function last_id() {
-    return $this->lastId();
-  }
-
 }

classes/Singleton.php

@@ -35,12 +35,4 @@ public function __wakeup() {
     throw new SingletonException('Unserializing ' . __CLASS__ . ' is not allowed.', 1412682032);
   }
 
-  /**
-   * @return object
-   * @deprecated Since: 1.4, Removal: 1.5, Reason: Use ->getInstance() instead
-   */
-  public static function get_instance() {
-    return self::getInstance();
-  }
-
 }