Skip to content

Commit

Permalink
Merge branch 'develop' into wip/config-writer-replacement
Browse files Browse the repository at this point in the history
  • Loading branch information
jaxwilko committed Jan 14, 2022
2 parents f9aedbe + a208f57 commit cdbf2f4
Show file tree
Hide file tree
Showing 38 changed files with 3,748 additions and 1,254 deletions.
21 changes: 0 additions & 21 deletions .github/workflows/code-quality-pr.yaml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Code Quality

on:
pull_request:
push:
branches:
- 1.0
Expand All @@ -21,5 +22,9 @@ jobs:
with:
php-version: '7.3'
tools: phpcs
- name: Run code quality checks
- name: Run code quality checks (on push)
if: github.event_name == 'push'
run: ./.github/workflows/utilities/phpcs-push ${{ github.sha }}
- name: Run code quality checks (on pull request)
if: github.event_name == 'pull_request'
run: ./.github/workflows/utilities/phpcs-pr ${{ github.base_ref }}
16 changes: 0 additions & 16 deletions .github/workflows/commander.yaml

This file was deleted.

3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ composer.lock

# Other files
.DS_Store
php_errors.log
php_errors.log
.phpunit.result.cache
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
Winter Storm
=======

This repository contains the core library for Winter CMS. If you want to build a website using Winter, visit the main [Winter repository](http://github.com/wintercms/winter).
[![Tests](https://img.shields.io/github/workflow/status/wintercms/storm/Tests/develop?label=tests&style=flat-square)](https://github.com/wintercms/storm/actions)
[![License](https://img.shields.io/github/license/wintercms/storm?label=open%20source&style=flat-square)](https://packagist.org/packages/winter/storm)
[![Discord](https://img.shields.io/discord/816852513684193281?label=discord&style=flat-square)](https://discord.gg/D5MFSPH6Ux)

This repository contains the core library for Winter CMS. If you want to build a website using Winter, visit the main [Winter repository](https://github.com/wintercms/winter).

Please report any library issues to the [main Winter repository](https://github.com/wintercms/winter/issues/new/choose).
23 changes: 23 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
backupGlobals="false"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
>
<coverage>
<include>
<directory suffix=".php">./src/</directory>
</include>
</coverage>
<testsuites>
<testsuite name="Storm Library Test Suite">
<directory>./tests</directory>
</testsuite>
</testsuites>
</phpunit>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* @author Alexey Bobkov, Samuel Georges
*/
class AuthException extends ApplicationException
class AuthenticationException extends ApplicationException
{
/**
* @var boolean Use less specific error messages.
Expand Down
16 changes: 16 additions & 0 deletions src/Auth/AuthorizationException.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php namespace Winter\Storm\Auth;

use Config;
use Winter\Storm\Exception\ApplicationException;
use Exception;
use Lang;

/**
* Used when user authorization fails. Implements a softer error message.
*
* @author Luke Towers
*/
class AuthorizationException extends ApplicationException
{

}
Loading

0 comments on commit cdbf2f4

Please sign in to comment.