Completed
Branch new-admin-design (7f58b2)
by
unknown
02:54
created
core/services/request/middleware/BotDetector.php 1 patch
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -17,23 +17,23 @@
 block discarded – undo
17 17
 class BotDetector extends Middleware
18 18
 {
19 19
 
20
-    /**
21
-     * converts a Request to a Response
22
-     *
23
-     * @param RequestInterface  $request
24
-     * @param ResponseInterface $response
25
-     * @return ResponseInterface
26
-     */
27
-    public function handleRequest(RequestInterface $request, ResponseInterface $response)
28
-    {
29
-        $this->request = $request;
30
-        $this->response = $response;
31
-        /** @var CrawlerDetect $CrawlerDetect */
32
-        $CrawlerDetect = $this->loader->getShared('EventEspressoVendor\Jaybizzle\CrawlerDetect\CrawlerDetect');
33
-        // Check and record the user agent of the current 'visitor'
34
-        $this->request->setIsBot($CrawlerDetect->isCrawler());
35
-        $this->request->setUserAgent($CrawlerDetect->userAgent());
36
-        $this->response = $this->processRequestStack($this->request, $this->response);
37
-        return $this->response;
38
-    }
20
+	/**
21
+	 * converts a Request to a Response
22
+	 *
23
+	 * @param RequestInterface  $request
24
+	 * @param ResponseInterface $response
25
+	 * @return ResponseInterface
26
+	 */
27
+	public function handleRequest(RequestInterface $request, ResponseInterface $response)
28
+	{
29
+		$this->request = $request;
30
+		$this->response = $response;
31
+		/** @var CrawlerDetect $CrawlerDetect */
32
+		$CrawlerDetect = $this->loader->getShared('EventEspressoVendor\Jaybizzle\CrawlerDetect\CrawlerDetect');
33
+		// Check and record the user agent of the current 'visitor'
34
+		$this->request->setIsBot($CrawlerDetect->isCrawler());
35
+		$this->request->setUserAgent($CrawlerDetect->userAgent());
36
+		$this->response = $this->processRequestStack($this->request, $this->response);
37
+		return $this->response;
38
+	}
39 39
 }
Please login to merge, or discard this patch.
core/services/request/middleware/Middleware.php 2 patches
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -25,52 +25,52 @@
 block discarded – undo
25 25
 abstract class Middleware implements RequestDecoratorInterface
26 26
 {
27 27
 
28
-    /**
29
-     * @var RequestDecoratorInterface $request_stack_app
30
-     */
31
-    protected $request_stack_app;
28
+	/**
29
+	 * @var RequestDecoratorInterface $request_stack_app
30
+	 */
31
+	protected $request_stack_app;
32 32
 
33
-    /**
34
-     * @var RequestInterface $request
35
-     */
36
-    protected $request;
33
+	/**
34
+	 * @var RequestInterface $request
35
+	 */
36
+	protected $request;
37 37
 
38
-    /**
39
-     * @var ResponseInterface $response
40
-     */
41
-    protected $response;
38
+	/**
39
+	 * @var ResponseInterface $response
40
+	 */
41
+	protected $response;
42 42
 
43
-    /**
44
-     * @var LoaderInterface
45
-     */
46
-    protected $loader;
43
+	/**
44
+	 * @var LoaderInterface
45
+	 */
46
+	protected $loader;
47 47
 
48 48
 
49
-    /**
50
-     * @param RequestDecoratorInterface $request_stack_app
51
-     * @param LoaderInterface           $loader
52
-     */
53
-    public function __construct(RequestDecoratorInterface $request_stack_app, LoaderInterface $loader)
54
-    {
55
-        $this->request_stack_app = $request_stack_app;
56
-        $this->loader = $loader;
57
-    }
49
+	/**
50
+	 * @param RequestDecoratorInterface $request_stack_app
51
+	 * @param LoaderInterface           $loader
52
+	 */
53
+	public function __construct(RequestDecoratorInterface $request_stack_app, LoaderInterface $loader)
54
+	{
55
+		$this->request_stack_app = $request_stack_app;
56
+		$this->loader = $loader;
57
+	}
58 58
 
59 59
 
60
-    /**
61
-     * process_request_stack
62
-     *
63
-     * @param RequestInterface  $request
64
-     * @param ResponseInterface $response
65
-     * @return ResponseInterface
66
-     */
67
-    protected function processRequestStack(RequestInterface $request, ResponseInterface $response)
68
-    {
69
-        $this->request = $request;
70
-        $this->response = $response;
71
-        if (! $this->response->requestTerminated()) {
72
-            $this->response = $this->request_stack_app->handleRequest($this->request, $this->response);
73
-        }
74
-        return $this->response;
75
-    }
60
+	/**
61
+	 * process_request_stack
62
+	 *
63
+	 * @param RequestInterface  $request
64
+	 * @param ResponseInterface $response
65
+	 * @return ResponseInterface
66
+	 */
67
+	protected function processRequestStack(RequestInterface $request, ResponseInterface $response)
68
+	{
69
+		$this->request = $request;
70
+		$this->response = $response;
71
+		if (! $this->response->requestTerminated()) {
72
+			$this->response = $this->request_stack_app->handleRequest($this->request, $this->response);
73
+		}
74
+		return $this->response;
75
+	}
76 76
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
     {
69 69
         $this->request = $request;
70 70
         $this->response = $response;
71
-        if (! $this->response->requestTerminated()) {
71
+        if ( ! $this->response->requestTerminated()) {
72 72
             $this->response = $this->request_stack_app->handleRequest($this->request, $this->response);
73 73
         }
74 74
         return $this->response;
Please login to merge, or discard this patch.
core/services/collections/LooseCollection.php 2 patches
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -16,37 +16,37 @@
 block discarded – undo
16 16
 {
17 17
 
18 18
 
19
-    /**
20
-     * setCollectionInterface
21
-     *
22
-     * @access protected
23
-     * @param  string $collection_interface
24
-     */
25
-    protected function setCollectionInterface($collection_interface)
26
-    {
27
-        $this->collection_interface = '';
28
-    }
19
+	/**
20
+	 * setCollectionInterface
21
+	 *
22
+	 * @access protected
23
+	 * @param  string $collection_interface
24
+	 */
25
+	protected function setCollectionInterface($collection_interface)
26
+	{
27
+		$this->collection_interface = '';
28
+	}
29 29
 
30 30
 
31
-    /**
32
-     * add
33
-     * attaches an object to the Collection
34
-     * and sets any supplied data associated with the current iterator entry
35
-     * by calling EE_Object_Collection::set_identifier()
36
-     *
37
-     * @access public
38
-     * @param  mixed $object
39
-     * @param  mixed $identifier
40
-     * @return bool
41
-     * @throws InvalidEntityException
42
-     */
43
-    public function add($object, $identifier = null)
44
-    {
45
-        if (! is_object($object)) {
46
-            throw new InvalidEntityException($object, 'object');
47
-        }
48
-        $this->attach($object);
49
-        $this->setIdentifier($object, $identifier);
50
-        return $this->contains($object);
51
-    }
31
+	/**
32
+	 * add
33
+	 * attaches an object to the Collection
34
+	 * and sets any supplied data associated with the current iterator entry
35
+	 * by calling EE_Object_Collection::set_identifier()
36
+	 *
37
+	 * @access public
38
+	 * @param  mixed $object
39
+	 * @param  mixed $identifier
40
+	 * @return bool
41
+	 * @throws InvalidEntityException
42
+	 */
43
+	public function add($object, $identifier = null)
44
+	{
45
+		if (! is_object($object)) {
46
+			throw new InvalidEntityException($object, 'object');
47
+		}
48
+		$this->attach($object);
49
+		$this->setIdentifier($object, $identifier);
50
+		return $this->contains($object);
51
+	}
52 52
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
      */
43 43
     public function add($object, $identifier = null)
44 44
     {
45
-        if (! is_object($object)) {
45
+        if ( ! is_object($object)) {
46 46
             throw new InvalidEntityException($object, 'object');
47 47
         }
48 48
         $this->attach($object);
Please login to merge, or discard this patch.
core/services/notices/NoticeConverter.php 1 patch
Indentation   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -12,71 +12,71 @@
 block discarded – undo
12 12
 abstract class NoticeConverter implements NoticeConverterInterface
13 13
 {
14 14
 
15
-    /**
16
-     * @var NoticesContainerInterface $notices
17
-     */
18
-    private $notices;
19
-
20
-    /**
21
-     * if set to true, then errors will be thrown as exceptions
22
-     *
23
-     * @var boolean $throw_exceptions
24
-     */
25
-    private $throw_exceptions;
26
-
27
-
28
-    /**
29
-     * NoticeConverter constructor.
30
-     *
31
-     * @param bool $throw_exceptions
32
-     */
33
-    public function __construct($throw_exceptions = false)
34
-    {
35
-        $this->throw_exceptions = $throw_exceptions;
36
-    }
37
-
38
-
39
-    /**
40
-     * @return NoticesContainerInterface
41
-     */
42
-    public function getNotices()
43
-    {
44
-        return $this->notices;
45
-    }
46
-
47
-
48
-    /**
49
-     * @param NoticesContainerInterface $notices
50
-     */
51
-    protected function setNotices(NoticesContainerInterface $notices)
52
-    {
53
-        $this->notices = $notices;
54
-    }
55
-
56
-
57
-    /**
58
-     * @return bool
59
-     */
60
-    public function getThrowExceptions()
61
-    {
62
-        return $this->throw_exceptions;
63
-    }
64
-
65
-
66
-    /**
67
-     * @param bool $throw_exceptions
68
-     */
69
-    public function setThrowExceptions($throw_exceptions)
70
-    {
71
-        $this->throw_exceptions = filter_var($throw_exceptions, FILTER_VALIDATE_BOOLEAN);
72
-    }
73
-
74
-
75
-    /**
76
-     * @return void;
77
-     */
78
-    public function clearNotices()
79
-    {
80
-        $this->notices = null;
81
-    }
15
+	/**
16
+	 * @var NoticesContainerInterface $notices
17
+	 */
18
+	private $notices;
19
+
20
+	/**
21
+	 * if set to true, then errors will be thrown as exceptions
22
+	 *
23
+	 * @var boolean $throw_exceptions
24
+	 */
25
+	private $throw_exceptions;
26
+
27
+
28
+	/**
29
+	 * NoticeConverter constructor.
30
+	 *
31
+	 * @param bool $throw_exceptions
32
+	 */
33
+	public function __construct($throw_exceptions = false)
34
+	{
35
+		$this->throw_exceptions = $throw_exceptions;
36
+	}
37
+
38
+
39
+	/**
40
+	 * @return NoticesContainerInterface
41
+	 */
42
+	public function getNotices()
43
+	{
44
+		return $this->notices;
45
+	}
46
+
47
+
48
+	/**
49
+	 * @param NoticesContainerInterface $notices
50
+	 */
51
+	protected function setNotices(NoticesContainerInterface $notices)
52
+	{
53
+		$this->notices = $notices;
54
+	}
55
+
56
+
57
+	/**
58
+	 * @return bool
59
+	 */
60
+	public function getThrowExceptions()
61
+	{
62
+		return $this->throw_exceptions;
63
+	}
64
+
65
+
66
+	/**
67
+	 * @param bool $throw_exceptions
68
+	 */
69
+	public function setThrowExceptions($throw_exceptions)
70
+	{
71
+		$this->throw_exceptions = filter_var($throw_exceptions, FILTER_VALIDATE_BOOLEAN);
72
+	}
73
+
74
+
75
+	/**
76
+	 * @return void;
77
+	 */
78
+	public function clearNotices()
79
+	{
80
+		$this->notices = null;
81
+	}
82 82
 }
Please login to merge, or discard this patch.
core/services/notices/AdminNotice.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     public function __construct(NoticeInterface $notice, $display_now = true)
41 41
     {
42 42
         $this->notice = $notice;
43
-        if (! did_action('admin_notices')) {
43
+        if ( ! did_action('admin_notices')) {
44 44
             add_action('admin_notices', array($this, 'displayNotice'));
45 45
         } elseif ($display_now) {
46 46
             $this->displayNotice();
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
     {
109 109
         $message = $this->notice->message();
110 110
         if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
111
-            $message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
111
+            $message .= '<br/><span class="tiny-text">'.$this->generateErrorCode().'</span>';
112 112
         }
113 113
         return $message;
114 114
     }
@@ -124,8 +124,8 @@  discard block
 block discarded – undo
124 124
     {
125 125
         $file = explode('.', basename($this->notice->file()));
126 126
         $error_code = ! empty($file[0]) ? $file[0] : '';
127
-        $error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
128
-        $error_code .= ' - ' . $this->notice->line();
127
+        $error_code .= ! empty($error_code) ? ' - '.$this->notice->func() : $this->notice->func();
128
+        $error_code .= ' - '.$this->notice->line();
129 129
         return $error_code;
130 130
     }
131 131
 }
Please login to merge, or discard this patch.
Indentation   +111 added lines, -111 removed lines patch added patch discarded remove patch
@@ -13,115 +13,115 @@
 block discarded – undo
13 13
 class AdminNotice
14 14
 {
15 15
 
16
-    const ERROR = 'notice-error';
17
-
18
-    const WARNING = 'notice-warning';
19
-
20
-    const SUCCESS = 'notice-success';
21
-
22
-    const INFORMATION = 'notice-info';
23
-
24
-    const DISMISSABLE = ' is-dismissible';
25
-
26
-    /**
27
-     * generic system notice to be converted into a WP admin notice
28
-     *
29
-     * @var NoticeInterface $notice
30
-     */
31
-    private $notice;
32
-
33
-
34
-    /**
35
-     * AdminNotice constructor.
36
-     *
37
-     * @param NoticeInterface $notice
38
-     * @param bool            $display_now
39
-     */
40
-    public function __construct(NoticeInterface $notice, $display_now = true)
41
-    {
42
-        $this->notice = $notice;
43
-        if (! did_action('admin_notices')) {
44
-            add_action('admin_notices', array($this, 'displayNotice'));
45
-        } elseif ($display_now) {
46
-            $this->displayNotice();
47
-        }
48
-    }
49
-
50
-
51
-    /**
52
-     * @return void
53
-     */
54
-    public function displayNotice()
55
-    {
56
-        echo $this->getNotice(); // sanitized
57
-    }
58
-
59
-
60
-    /**
61
-     * produces something  like:
62
-     *  <div class="notice notice-success is-dismissible event-espresso-admin-notice">
63
-     *      <p>YOU DID IT!</p>
64
-     *      <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this
65
-     *      notice.</span></button>
66
-     *  </div>
67
-     *
68
-     * @return string
69
-     */
70
-    public function getNotice()
71
-    {
72
-        return sprintf(
73
-            '<div class="notice %1$s%2$s event-espresso-admin-notice"><p>%3$s</p></div>',
74
-            $this->getType(),
75
-            $this->notice->isDismissible() ? AdminNotice::DISMISSABLE : '',
76
-            $this->getMessage()
77
-        );
78
-    }
79
-
80
-
81
-    /**
82
-     * @return string
83
-     */
84
-    private function getType()
85
-    {
86
-        switch ($this->notice->type()) {
87
-            case Notice::ERROR:
88
-                return AdminNotice::ERROR;
89
-            case Notice::ATTENTION:
90
-                return AdminNotice::WARNING;
91
-            case Notice::SUCCESS:
92
-                return AdminNotice::SUCCESS;
93
-            case Notice::INFORMATION:
94
-            default:
95
-                return AdminNotice::INFORMATION;
96
-        }
97
-    }
98
-
99
-
100
-    /**
101
-     * @return string
102
-     */
103
-    protected function getMessage()
104
-    {
105
-        $message = $this->notice->message();
106
-        if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
107
-            $message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
108
-        }
109
-        return $message;
110
-    }
111
-
112
-
113
-    /**
114
-     * create error code from filepath, function name,
115
-     * and line number where notice was generated
116
-     *
117
-     * @return string
118
-     */
119
-    protected function generateErrorCode()
120
-    {
121
-        $file = explode('.', basename($this->notice->file()));
122
-        $error_code = ! empty($file[0]) ? $file[0] : '';
123
-        $error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
124
-        $error_code .= ' - ' . $this->notice->line();
125
-        return $error_code;
126
-    }
16
+	const ERROR = 'notice-error';
17
+
18
+	const WARNING = 'notice-warning';
19
+
20
+	const SUCCESS = 'notice-success';
21
+
22
+	const INFORMATION = 'notice-info';
23
+
24
+	const DISMISSABLE = ' is-dismissible';
25
+
26
+	/**
27
+	 * generic system notice to be converted into a WP admin notice
28
+	 *
29
+	 * @var NoticeInterface $notice
30
+	 */
31
+	private $notice;
32
+
33
+
34
+	/**
35
+	 * AdminNotice constructor.
36
+	 *
37
+	 * @param NoticeInterface $notice
38
+	 * @param bool            $display_now
39
+	 */
40
+	public function __construct(NoticeInterface $notice, $display_now = true)
41
+	{
42
+		$this->notice = $notice;
43
+		if (! did_action('admin_notices')) {
44
+			add_action('admin_notices', array($this, 'displayNotice'));
45
+		} elseif ($display_now) {
46
+			$this->displayNotice();
47
+		}
48
+	}
49
+
50
+
51
+	/**
52
+	 * @return void
53
+	 */
54
+	public function displayNotice()
55
+	{
56
+		echo $this->getNotice(); // sanitized
57
+	}
58
+
59
+
60
+	/**
61
+	 * produces something  like:
62
+	 *  <div class="notice notice-success is-dismissible event-espresso-admin-notice">
63
+	 *      <p>YOU DID IT!</p>
64
+	 *      <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this
65
+	 *      notice.</span></button>
66
+	 *  </div>
67
+	 *
68
+	 * @return string
69
+	 */
70
+	public function getNotice()
71
+	{
72
+		return sprintf(
73
+			'<div class="notice %1$s%2$s event-espresso-admin-notice"><p>%3$s</p></div>',
74
+			$this->getType(),
75
+			$this->notice->isDismissible() ? AdminNotice::DISMISSABLE : '',
76
+			$this->getMessage()
77
+		);
78
+	}
79
+
80
+
81
+	/**
82
+	 * @return string
83
+	 */
84
+	private function getType()
85
+	{
86
+		switch ($this->notice->type()) {
87
+			case Notice::ERROR:
88
+				return AdminNotice::ERROR;
89
+			case Notice::ATTENTION:
90
+				return AdminNotice::WARNING;
91
+			case Notice::SUCCESS:
92
+				return AdminNotice::SUCCESS;
93
+			case Notice::INFORMATION:
94
+			default:
95
+				return AdminNotice::INFORMATION;
96
+		}
97
+	}
98
+
99
+
100
+	/**
101
+	 * @return string
102
+	 */
103
+	protected function getMessage()
104
+	{
105
+		$message = $this->notice->message();
106
+		if (WP_DEBUG && $this->getType() === AdminNotice::ERROR) {
107
+			$message .= '<br/><span class="tiny-text">' . $this->generateErrorCode() . '</span>';
108
+		}
109
+		return $message;
110
+	}
111
+
112
+
113
+	/**
114
+	 * create error code from filepath, function name,
115
+	 * and line number where notice was generated
116
+	 *
117
+	 * @return string
118
+	 */
119
+	protected function generateErrorCode()
120
+	{
121
+		$file = explode('.', basename($this->notice->file()));
122
+		$error_code = ! empty($file[0]) ? $file[0] : '';
123
+		$error_code .= ! empty($error_code) ? ' - ' . $this->notice->func() : $this->notice->func();
124
+		$error_code .= ' - ' . $this->notice->line();
125
+		return $error_code;
126
+	}
127 127
 }
Please login to merge, or discard this patch.
core/services/notices/NoticesContainer.php 1 patch
Indentation   +214 added lines, -214 removed lines patch added patch discarded remove patch
@@ -15,218 +15,218 @@
 block discarded – undo
15 15
 {
16 16
 
17 17
 
18
-    /**
19
-     * @var NoticeInterface[] $information
20
-     */
21
-    private $information = array();
22
-
23
-
24
-    /**
25
-     * @var NoticeInterface[] $attention
26
-     */
27
-    private $attention = array();
28
-
29
-
30
-    /**
31
-     * @var NoticeInterface[] $error
32
-     */
33
-    private $error = array();
34
-
35
-
36
-    /**
37
-     * @var NoticeInterface[] $success
38
-     */
39
-    private $success = array();
40
-
41
-
42
-    /**
43
-     * @param string $notice
44
-     * @param bool   $dismissible
45
-     * @param string $file
46
-     * @param string $func
47
-     * @param string $line
48
-     * @throws InvalidDataTypeException
49
-     */
50
-    public function addInformation($notice, $dismissible = true, $file = '', $func = '', $line = '')
51
-    {
52
-        $this->information[] = new Notice(
53
-            Notice::INFORMATION,
54
-            $notice,
55
-            $dismissible,
56
-            $file,
57
-            $func,
58
-            $line
59
-        );
60
-    }
61
-
62
-
63
-    /**
64
-     * @param string $notice
65
-     * @param bool   $dismissible
66
-     * @param string $file
67
-     * @param string $func
68
-     * @param string $line
69
-     * @throws InvalidDataTypeException
70
-     */
71
-    public function addAttention($notice, $dismissible = true, $file = '', $func = '', $line = '')
72
-    {
73
-        $this->attention[] = new Notice(
74
-            Notice::ATTENTION,
75
-            $notice,
76
-            $dismissible,
77
-            $file,
78
-            $func,
79
-            $line
80
-        );
81
-    }
82
-
83
-    // phpcs:disable PEAR.Functions.ValidDefaultValue.NotAtEnd
84
-    /**
85
-     * @param string $notice
86
-     * @param bool   $dismissible
87
-     * @param string $file
88
-     * @param string $func
89
-     * @param string $line
90
-     * @throws InvalidDataTypeException
91
-     */
92
-    public function addError($notice, $dismissible = true, $file, $func, $line)
93
-    {
94
-        $this->error[] = new Notice(
95
-            Notice::ERROR,
96
-            $notice,
97
-            $dismissible,
98
-            $file,
99
-            $func,
100
-            $line
101
-        );
102
-    }
103
-
104
-
105
-    /**
106
-     * @param string $notice
107
-     * @param bool   $dismissible
108
-     * @param string $file
109
-     * @param string $func
110
-     * @param string $line
111
-     * @throws InvalidDataTypeException
112
-     */
113
-    public function addSuccess($notice, $dismissible = true, $file = '', $func = '', $line = '')
114
-    {
115
-        $this->success[] = new Notice(
116
-            Notice::SUCCESS,
117
-            $notice,
118
-            $dismissible,
119
-            $file,
120
-            $func,
121
-            $line
122
-        );
123
-    }
124
-
125
-
126
-    /**
127
-     * @return boolean
128
-     */
129
-    public function hasInformation()
130
-    {
131
-        return ! empty($this->information);
132
-    }
133
-
134
-
135
-    /**
136
-     * @return boolean
137
-     */
138
-    public function hasAttention()
139
-    {
140
-        return ! empty($this->attention);
141
-    }
142
-
143
-
144
-    /**
145
-     * @return boolean
146
-     */
147
-    public function hasError()
148
-    {
149
-        return ! empty($this->error);
150
-    }
151
-
152
-
153
-    /**
154
-     * @return boolean
155
-     */
156
-    public function hasSuccess()
157
-    {
158
-        return ! empty($this->success);
159
-    }
160
-
161
-
162
-    /**
163
-     * @return int
164
-     */
165
-    public function countInformation()
166
-    {
167
-        return count($this->information);
168
-    }
169
-
170
-
171
-    /**
172
-     * @return int
173
-     */
174
-    public function countAttention()
175
-    {
176
-        return count($this->attention);
177
-    }
178
-
179
-
180
-    /**
181
-     * @return int
182
-     */
183
-    public function countError()
184
-    {
185
-        return count($this->error);
186
-    }
187
-
188
-
189
-    /**
190
-     * @return int
191
-     */
192
-    public function countSuccess()
193
-    {
194
-        return count($this->success);
195
-    }
196
-
197
-
198
-    /**
199
-     * @return NoticeInterface[]
200
-     */
201
-    public function getInformation()
202
-    {
203
-        return $this->information;
204
-    }
205
-
206
-
207
-    /**
208
-     * @return NoticeInterface[]
209
-     */
210
-    public function getAttention()
211
-    {
212
-        return $this->attention;
213
-    }
214
-
215
-
216
-    /**
217
-     * @return NoticeInterface[]
218
-     */
219
-    public function getError()
220
-    {
221
-        return $this->error;
222
-    }
223
-
224
-
225
-    /**
226
-     * @return NoticeInterface[]
227
-     */
228
-    public function getSuccess()
229
-    {
230
-        return $this->success;
231
-    }
18
+	/**
19
+	 * @var NoticeInterface[] $information
20
+	 */
21
+	private $information = array();
22
+
23
+
24
+	/**
25
+	 * @var NoticeInterface[] $attention
26
+	 */
27
+	private $attention = array();
28
+
29
+
30
+	/**
31
+	 * @var NoticeInterface[] $error
32
+	 */
33
+	private $error = array();
34
+
35
+
36
+	/**
37
+	 * @var NoticeInterface[] $success
38
+	 */
39
+	private $success = array();
40
+
41
+
42
+	/**
43
+	 * @param string $notice
44
+	 * @param bool   $dismissible
45
+	 * @param string $file
46
+	 * @param string $func
47
+	 * @param string $line
48
+	 * @throws InvalidDataTypeException
49
+	 */
50
+	public function addInformation($notice, $dismissible = true, $file = '', $func = '', $line = '')
51
+	{
52
+		$this->information[] = new Notice(
53
+			Notice::INFORMATION,
54
+			$notice,
55
+			$dismissible,
56
+			$file,
57
+			$func,
58
+			$line
59
+		);
60
+	}
61
+
62
+
63
+	/**
64
+	 * @param string $notice
65
+	 * @param bool   $dismissible
66
+	 * @param string $file
67
+	 * @param string $func
68
+	 * @param string $line
69
+	 * @throws InvalidDataTypeException
70
+	 */
71
+	public function addAttention($notice, $dismissible = true, $file = '', $func = '', $line = '')
72
+	{
73
+		$this->attention[] = new Notice(
74
+			Notice::ATTENTION,
75
+			$notice,
76
+			$dismissible,
77
+			$file,
78
+			$func,
79
+			$line
80
+		);
81
+	}
82
+
83
+	// phpcs:disable PEAR.Functions.ValidDefaultValue.NotAtEnd
84
+	/**
85
+	 * @param string $notice
86
+	 * @param bool   $dismissible
87
+	 * @param string $file
88
+	 * @param string $func
89
+	 * @param string $line
90
+	 * @throws InvalidDataTypeException
91
+	 */
92
+	public function addError($notice, $dismissible = true, $file, $func, $line)
93
+	{
94
+		$this->error[] = new Notice(
95
+			Notice::ERROR,
96
+			$notice,
97
+			$dismissible,
98
+			$file,
99
+			$func,
100
+			$line
101
+		);
102
+	}
103
+
104
+
105
+	/**
106
+	 * @param string $notice
107
+	 * @param bool   $dismissible
108
+	 * @param string $file
109
+	 * @param string $func
110
+	 * @param string $line
111
+	 * @throws InvalidDataTypeException
112
+	 */
113
+	public function addSuccess($notice, $dismissible = true, $file = '', $func = '', $line = '')
114
+	{
115
+		$this->success[] = new Notice(
116
+			Notice::SUCCESS,
117
+			$notice,
118
+			$dismissible,
119
+			$file,
120
+			$func,
121
+			$line
122
+		);
123
+	}
124
+
125
+
126
+	/**
127
+	 * @return boolean
128
+	 */
129
+	public function hasInformation()
130
+	{
131
+		return ! empty($this->information);
132
+	}
133
+
134
+
135
+	/**
136
+	 * @return boolean
137
+	 */
138
+	public function hasAttention()
139
+	{
140
+		return ! empty($this->attention);
141
+	}
142
+
143
+
144
+	/**
145
+	 * @return boolean
146
+	 */
147
+	public function hasError()
148
+	{
149
+		return ! empty($this->error);
150
+	}
151
+
152
+
153
+	/**
154
+	 * @return boolean
155
+	 */
156
+	public function hasSuccess()
157
+	{
158
+		return ! empty($this->success);
159
+	}
160
+
161
+
162
+	/**
163
+	 * @return int
164
+	 */
165
+	public function countInformation()
166
+	{
167
+		return count($this->information);
168
+	}
169
+
170
+
171
+	/**
172
+	 * @return int
173
+	 */
174
+	public function countAttention()
175
+	{
176
+		return count($this->attention);
177
+	}
178
+
179
+
180
+	/**
181
+	 * @return int
182
+	 */
183
+	public function countError()
184
+	{
185
+		return count($this->error);
186
+	}
187
+
188
+
189
+	/**
190
+	 * @return int
191
+	 */
192
+	public function countSuccess()
193
+	{
194
+		return count($this->success);
195
+	}
196
+
197
+
198
+	/**
199
+	 * @return NoticeInterface[]
200
+	 */
201
+	public function getInformation()
202
+	{
203
+		return $this->information;
204
+	}
205
+
206
+
207
+	/**
208
+	 * @return NoticeInterface[]
209
+	 */
210
+	public function getAttention()
211
+	{
212
+		return $this->attention;
213
+	}
214
+
215
+
216
+	/**
217
+	 * @return NoticeInterface[]
218
+	 */
219
+	public function getError()
220
+	{
221
+		return $this->error;
222
+	}
223
+
224
+
225
+	/**
226
+	 * @return NoticeInterface[]
227
+	 */
228
+	public function getSuccess()
229
+	{
230
+		return $this->success;
231
+	}
232 232
 }
Please login to merge, or discard this patch.
core/services/container/CoffeeMill.php 1 patch
Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -15,59 +15,59 @@
 block discarded – undo
15 15
 class CoffeeMill
16 16
 {
17 17
 
18
-    /**
19
-     * @var CoffeeShop $coffee_shop
20
-     */
21
-    private static $coffee_shop;
18
+	/**
19
+	 * @var CoffeeShop $coffee_shop
20
+	 */
21
+	private static $coffee_shop;
22 22
 
23 23
 
24
-    /**
25
-     * @return mixed
26
-     */
27
-    public static function getCoffeeShop()
28
-    {
29
-        return self::$coffee_shop;
30
-    }
24
+	/**
25
+	 * @return mixed
26
+	 */
27
+	public static function getCoffeeShop()
28
+	{
29
+		return self::$coffee_shop;
30
+	}
31 31
 
32 32
 
33
-    /**
34
-     * @param CoffeeShop $coffee_shop
35
-     */
36
-    public static function setCoffeeShop(CoffeeShop $coffee_shop)
37
-    {
38
-        self::$coffee_shop = $coffee_shop;
39
-    }
33
+	/**
34
+	 * @param CoffeeShop $coffee_shop
35
+	 */
36
+	public static function setCoffeeShop(CoffeeShop $coffee_shop)
37
+	{
38
+		self::$coffee_shop = $coffee_shop;
39
+	}
40 40
 
41 41
 
42
-    /**
43
-     * @param string $identifier
44
-     * @param array  $arguments
45
-     * @param string $type
46
-     * @return mixed
47
-     * @throws ServiceNotFoundException
48
-     */
49
-    public static function createNew($identifier, $arguments = array(), $type = CoffeeMaker::BREW_NEW)
50
-    {
51
-        return self::$coffee_shop->brew($identifier, $arguments, $type);
52
-    }
42
+	/**
43
+	 * @param string $identifier
44
+	 * @param array  $arguments
45
+	 * @param string $type
46
+	 * @return mixed
47
+	 * @throws ServiceNotFoundException
48
+	 */
49
+	public static function createNew($identifier, $arguments = array(), $type = CoffeeMaker::BREW_NEW)
50
+	{
51
+		return self::$coffee_shop->brew($identifier, $arguments, $type);
52
+	}
53 53
 
54 54
 
55
-    /**
56
-     * IMPORTANT!!!
57
-     * Usage of this method is discouraged as it promotes service location.
58
-     * It's current use is only as a stop gap measure until the CoffeeShop
59
-     * Dependency Injection Container can be implemented properly for all classes.
60
-     * If it is at all possible, inject your dependencies via your class constructor.
61
-     * This method WILL BE DEPRECATED at some point in the near future.
62
-     *
63
-     * @param string $identifier
64
-     * @param array  $arguments
65
-     * @param string $type
66
-     * @return mixed
67
-     * @throws ServiceNotFoundException
68
-     */
69
-    public static function getService($identifier, $arguments = array(), $type = CoffeeMaker::BREW_SHARED)
70
-    {
71
-        return self::$coffee_shop->brew($identifier, $arguments, $type);
72
-    }
55
+	/**
56
+	 * IMPORTANT!!!
57
+	 * Usage of this method is discouraged as it promotes service location.
58
+	 * It's current use is only as a stop gap measure until the CoffeeShop
59
+	 * Dependency Injection Container can be implemented properly for all classes.
60
+	 * If it is at all possible, inject your dependencies via your class constructor.
61
+	 * This method WILL BE DEPRECATED at some point in the near future.
62
+	 *
63
+	 * @param string $identifier
64
+	 * @param array  $arguments
65
+	 * @param string $type
66
+	 * @return mixed
67
+	 * @throws ServiceNotFoundException
68
+	 */
69
+	public static function getService($identifier, $arguments = array(), $type = CoffeeMaker::BREW_SHARED)
70
+	{
71
+		return self::$coffee_shop->brew($identifier, $arguments, $type);
72
+	}
73 73
 }
Please login to merge, or discard this patch.
core/services/container/NewCoffeeMaker.php 2 patches
Indentation   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -20,51 +20,51 @@
 block discarded – undo
20 20
 {
21 21
 
22 22
 
23
-    /**
24
-     * @return string
25
-     */
26
-    public function type()
27
-    {
28
-        return CoffeeMaker::BREW_NEW;
29
-    }
23
+	/**
24
+	 * @return string
25
+	 */
26
+	public function type()
27
+	{
28
+		return CoffeeMaker::BREW_NEW;
29
+	}
30 30
 
31 31
 
32
-    /**
33
-     * @param RecipeInterface $recipe
34
-     * @param array           $arguments
35
-     * @return mixed
36
-     */
37
-    public function brew(RecipeInterface $recipe, $arguments = array())
38
-    {
39
-        $this->resolveClassAndFilepath($recipe);
40
-        $reflector = $this->injector()->getReflectionClass($recipe->fqcn());
41
-        $method = $this->resolveInstantiationMethod($reflector);
42
-        switch ($method) {
43
-            case 'instance':
44
-            case 'new_instance':
45
-            case 'new_instance_from_db':
46
-                $injector = $this->injector();
47
-                $closure = function ($arguments) use ($recipe, $reflector, $method, $injector) {
48
-                    return call_user_func_array(
49
-                        array($reflector->getName(), $method),
50
-                        $injector->resolveDependencies($recipe, $reflector, $arguments)
51
-                    );
52
-                };
53
-                break;
54
-            case 'newInstance':
55
-                $closure = function () use ($reflector) {
56
-                    return $reflector->newInstance();
57
-                };
58
-                break;
59
-            case 'newInstanceArgs':
60
-            default:
61
-                $injector = $this->injector();
62
-                $closure = function ($arguments) use ($recipe, $reflector, $injector) {
63
-                    return $reflector->newInstanceArgs(
64
-                        $injector->resolveDependencies($recipe, $reflector, $arguments)
65
-                    );
66
-                };
67
-        }
68
-        return $this->coffeePot()->addClosure($recipe->identifier(), $closure);
69
-    }
32
+	/**
33
+	 * @param RecipeInterface $recipe
34
+	 * @param array           $arguments
35
+	 * @return mixed
36
+	 */
37
+	public function brew(RecipeInterface $recipe, $arguments = array())
38
+	{
39
+		$this->resolveClassAndFilepath($recipe);
40
+		$reflector = $this->injector()->getReflectionClass($recipe->fqcn());
41
+		$method = $this->resolveInstantiationMethod($reflector);
42
+		switch ($method) {
43
+			case 'instance':
44
+			case 'new_instance':
45
+			case 'new_instance_from_db':
46
+				$injector = $this->injector();
47
+				$closure = function ($arguments) use ($recipe, $reflector, $method, $injector) {
48
+					return call_user_func_array(
49
+						array($reflector->getName(), $method),
50
+						$injector->resolveDependencies($recipe, $reflector, $arguments)
51
+					);
52
+				};
53
+				break;
54
+			case 'newInstance':
55
+				$closure = function () use ($reflector) {
56
+					return $reflector->newInstance();
57
+				};
58
+				break;
59
+			case 'newInstanceArgs':
60
+			default:
61
+				$injector = $this->injector();
62
+				$closure = function ($arguments) use ($recipe, $reflector, $injector) {
63
+					return $reflector->newInstanceArgs(
64
+						$injector->resolveDependencies($recipe, $reflector, $arguments)
65
+					);
66
+				};
67
+		}
68
+		return $this->coffeePot()->addClosure($recipe->identifier(), $closure);
69
+	}
70 70
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
             case 'new_instance':
45 45
             case 'new_instance_from_db':
46 46
                 $injector = $this->injector();
47
-                $closure = function ($arguments) use ($recipe, $reflector, $method, $injector) {
47
+                $closure = function($arguments) use ($recipe, $reflector, $method, $injector) {
48 48
                     return call_user_func_array(
49 49
                         array($reflector->getName(), $method),
50 50
                         $injector->resolveDependencies($recipe, $reflector, $arguments)
@@ -52,14 +52,14 @@  discard block
 block discarded – undo
52 52
                 };
53 53
                 break;
54 54
             case 'newInstance':
55
-                $closure = function () use ($reflector) {
55
+                $closure = function() use ($reflector) {
56 56
                     return $reflector->newInstance();
57 57
                 };
58 58
                 break;
59 59
             case 'newInstanceArgs':
60 60
             default:
61 61
                 $injector = $this->injector();
62
-                $closure = function ($arguments) use ($recipe, $reflector, $injector) {
62
+                $closure = function($arguments) use ($recipe, $reflector, $injector) {
63 63
                     return $reflector->newInstanceArgs(
64 64
                         $injector->resolveDependencies($recipe, $reflector, $arguments)
65 65
                     );
Please login to merge, or discard this patch.
core/services/container/SharedCoffeeMaker.php 1 patch
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -18,43 +18,43 @@
 block discarded – undo
18 18
 {
19 19
 
20 20
 
21
-    /**
22
-     * @return string
23
-     */
24
-    public function type()
25
-    {
26
-        return CoffeeMaker::BREW_SHARED;
27
-    }
21
+	/**
22
+	 * @return string
23
+	 */
24
+	public function type()
25
+	{
26
+		return CoffeeMaker::BREW_SHARED;
27
+	}
28 28
 
29 29
 
30
-    /**
31
-     * @param RecipeInterface $recipe
32
-     * @param array           $arguments
33
-     * @return mixed
34
-     */
35
-    public function brew(RecipeInterface $recipe, $arguments = array())
36
-    {
37
-        $this->resolveClassAndFilepath($recipe);
38
-        $reflector = $this->injector()->getReflectionClass($recipe->fqcn());
39
-        $method = $this->resolveInstantiationMethod($reflector);
40
-        switch ($method) {
41
-            case 'instance':
42
-            case 'new_instance':
43
-            case 'new_instance_from_db':
44
-                $service = call_user_func_array(
45
-                    array($reflector->getName(), $method),
46
-                    $this->injector()->resolveDependencies($recipe, $reflector, $arguments)
47
-                );
48
-                break;
49
-            case 'newInstance':
50
-                $service = $reflector->newInstance();
51
-                break;
52
-            case 'newInstanceArgs':
53
-            default:
54
-                $service = $reflector->newInstanceArgs(
55
-                    $this->injector()->resolveDependencies($recipe, $reflector, $arguments)
56
-                );
57
-        }
58
-        return $this->coffeePot()->addService($recipe->identifier(), $service);
59
-    }
30
+	/**
31
+	 * @param RecipeInterface $recipe
32
+	 * @param array           $arguments
33
+	 * @return mixed
34
+	 */
35
+	public function brew(RecipeInterface $recipe, $arguments = array())
36
+	{
37
+		$this->resolveClassAndFilepath($recipe);
38
+		$reflector = $this->injector()->getReflectionClass($recipe->fqcn());
39
+		$method = $this->resolveInstantiationMethod($reflector);
40
+		switch ($method) {
41
+			case 'instance':
42
+			case 'new_instance':
43
+			case 'new_instance_from_db':
44
+				$service = call_user_func_array(
45
+					array($reflector->getName(), $method),
46
+					$this->injector()->resolveDependencies($recipe, $reflector, $arguments)
47
+				);
48
+				break;
49
+			case 'newInstance':
50
+				$service = $reflector->newInstance();
51
+				break;
52
+			case 'newInstanceArgs':
53
+			default:
54
+				$service = $reflector->newInstanceArgs(
55
+					$this->injector()->resolveDependencies($recipe, $reflector, $arguments)
56
+				);
57
+		}
58
+		return $this->coffeePot()->addService($recipe->identifier(), $service);
59
+	}
60 60
 }
Please login to merge, or discard this patch.