Skip to content

Commit

Permalink
Merge pull request #12 from lukereative/ss4
Browse files Browse the repository at this point in the history
MAJOR: SS4 Upgrade
  • Loading branch information
Luke Edwards authored May 28, 2018
2 parents bae0dc1 + 48e27ba commit c65c899
Show file tree
Hide file tree
Showing 27 changed files with 647 additions and 527 deletions.
16 changes: 10 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# For more information about the properties used in this file,
# please see the EditorConfig documentation:
# http://editorconfig.org
# For more information about the properties used in
# this file, please see the EditorConfig documentation:
# http://editorconfig.org/

[*]
charset = utf-8
Expand All @@ -10,8 +10,12 @@ indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[{*.yml,package.json}]
[*.md]
trim_trailing_whitespace = false

[*.{yml,js,json,css,scss,eslintrc,feature}]
indent_size = 2
indent_style = space

# The indent size used in the package.json file cannot be changed:
# https://github.com/npm/npm/pull/3180#issuecomment-16336516
[composer.json]
indent_size = 4
12 changes: 0 additions & 12 deletions .gitignore

This file was deleted.

24 changes: 8 additions & 16 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
The MIT License (MIT)
Copyright (c) 2013, Luke Edwards
All rights reserved.

Copyright (c) 2013 Luke Edwards
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ A module for adding a podcast or multiple podcasts to your SilverStripe site. Wi

## Requirements

* SilverStripe 3.4
* SilverStripe 4.1

## Installation

Expand All @@ -20,9 +20,5 @@ A module for adding a podcast or multiple podcasts to your SilverStripe site. Wi
4. Once you have added the project page, filled in details and added episodes, you will be able to view your podcast and play/view episodes at the podcast page url. Your RSS Feed http://example.co.nz/$PodcastPage/rss
5. Single episodes are linkable/viewable at http://example.co.nz/$PodcastPage/episode/$ID – $PodcastPage being your podcast page URL and $ID being the unique ID of the podcast (viewable in the CMS)

## Third Party

The podcast page uses [plyr.js](https://plyr.io/) to support cross browser playing of HTML5 `<audio>` and `<video>` elements. Not all browsers support all video/audio codecs, so it may not play in some browsers – although there is a link provided for each episode to be downloaded just in case.

## Contact
Feel free to email me at <[email protected]> with any suggestions, comments or to say thanks. Log any issues on the [GitHub repository](https://github.com/lukereative/silverstripe-podcast) or feel free to issue a pull request with a fix.
1 change: 1 addition & 0 deletions _config.php
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<?php
7 changes: 7 additions & 0 deletions _config/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
Name: lukereative/podcast
---

SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest:
extensions:
- Lukereative\Podcast\Extensions\GetID3Tags
File renamed without changes.
212 changes: 0 additions & 212 deletions code/dataobjects/PodcastEpisode.php

This file was deleted.

37 changes: 25 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,32 @@
{
"name": "lukereative/silverstripe-podcast",
"description": "A module for adding a podcast or multiple podcasts to your SilverStripe site. With support for audio, video or other files.",
"type": "silverstripe-module",
"keywords": ["silverstripe", "podcast"],
"license": "MIT",
"type": "silverstripe-vendormodule",
"keywords": [
"silverstripe",
"podcast"
],
"license": "BSD-3-Clause",
"authors": [{
"name": "Luke Edwards",
"email": "luke@edwards.co.nz"
}],
"email": "luke@silverstripe.com"
}],
"require": {
"silverstripe/framework": "~3.4",
"silverstripe/cms": "~3.4",
"james-heinrich/getid3": "~1.9.12"
},
"extra": {
"installer-name": "podcast"
}
"silverstripe/framework": "^4.1",
"silverstripe/cms": "^4.1",
"phansys/getid3": "^2.1@dev"
},
"autoload": {
"psr-4": {
"Lukereative\\Podcast\\": "src/"
}
},
"extra": {
"expose": [
"client/dist",
"images"
]
},
"prefer-stable": true,
"minimum-stability": "dev"
}
Binary file removed images/podcast-page.png
Binary file not shown.
1 change: 1 addition & 0 deletions images/podcast-page.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions javascript/podcast-page.js

This file was deleted.

22 changes: 22 additions & 0 deletions phpcs.xml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset name="SilverStripe">
<description>CodeSniffer ruleset for SilverStripe coding conventions.</description>

<!-- base rules are PSR-2 -->
<rule ref="PSR2" >
<!-- Current exclusions -->
<exclude name="PSR1.Methods.CamelCapsMethodName" />
<exclude name="PSR1.Files.SideEffects.FoundWithSymbols" />
<exclude name="PSR2.Classes.PropertyDeclaration" />
<exclude name="PSR2.ControlStructures.SwitchDeclaration" /> <!-- causes php notice while linting -->
<exclude name="PSR2.ControlStructures.SwitchDeclaration.WrongOpenercase" />
<exclude name="PSR2.ControlStructures.SwitchDeclaration.WrongOpenerdefault" />
<exclude name="PSR2.ControlStructures.SwitchDeclaration.TerminatingComment" />
<exclude name="PSR2.Methods.MethodDeclaration.Underscore" />
<exclude name="Squiz.Scope.MethodScope" />
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps" />
<exclude name="Generic.Files.LineLength.TooLong" />
<exclude name="PEAR.Functions.ValidDefaultValue.NotAtEnd" />
</rule>
</ruleset>

Loading

0 comments on commit c65c899

Please sign in to comment.