Skip to content

Commit

Permalink
Validate composer deps
Browse files Browse the repository at this point in the history
  • Loading branch information
@MickeyKay
MickeyKay committed Sep 14, 2020
1 parent 1a1be79 commit 7599583
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 164 deletions.
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Better Font Awesome",
"license": "GPL-2.0",
"require": {
"mickey-kay/better-font-awesome-library": "v2.0.0-beta3"
"mickey-kay/better-font-awesome-library": "v2.0.0-beta4"
},
"require-dev": {
"phpunit/phpunit": "^7"
Expand Down
67 changes: 7 additions & 60 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/composer/autoload_files.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@

return array(
'320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
'04c6c5c2f7095ccf6c481d3e53e1776f' => $vendorDir . '/mustangostang/spyc/Spyc.php',
'6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
);
1 change: 0 additions & 1 deletion vendor/composer/autoload_static.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ class ComposerStaticInit41155fb5b1da53975966634b23b8c168
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
'04c6c5c2f7095ccf6c481d3e53e1776f' => __DIR__ . '/..' . '/mustangostang/spyc/Spyc.php',
'6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
);

Expand Down
69 changes: 7 additions & 62 deletions vendor/composer/installed.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,82 +73,27 @@
},
{
"name": "mickey-kay/better-font-awesome-library",
"version": "v2.0.0-beta3",
"version_normalized": "2.0.0.0-beta3",
"version": "v2.0.0-beta4",
"version_normalized": "2.0.0.0-beta4",
"source": {
"type": "git",
"url": "https://github.com/MickeyKay/better-font-awesome-library.git",
"reference": "e0f85b8e2195484868e4f1523757ad59b787552d"
"reference": "518931b9d784635db3327b67b9b31cb78a01d908"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/MickeyKay/better-font-awesome-library/zipball/e0f85b8e2195484868e4f1523757ad59b787552d",
"reference": "e0f85b8e2195484868e4f1523757ad59b787552d",
"url": "https://api.github.com/repos/MickeyKay/better-font-awesome-library/zipball/518931b9d784635db3327b67b9b31cb78a01d908",
"reference": "518931b9d784635db3327b67b9b31cb78a01d908",
"shasum": ""
},
"require": {
"mustangostang/spyc": "^0.6.2"
},
"time": "2018-05-21T03:18:33+00:00",
"time": "2020-09-14T16:26:16+00:00",
"type": "library",
"installation-source": "dist",
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0"
],
"description": "Better Font Awesome Library for PHP"
},
{
"name": "mustangostang/spyc",
"version": "0.6.3",
"version_normalized": "0.6.3.0",
"source": {
"type": "git",
"url": "[email protected]:mustangostang/spyc.git",
"reference": "4627c838b16550b666d15aeae1e5289dd5b77da0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mustangostang/spyc/zipball/4627c838b16550b666d15aeae1e5289dd5b77da0",
"reference": "4627c838b16550b666d15aeae1e5289dd5b77da0",
"shasum": ""
},
"require": {
"php": ">=5.3.1"
},
"require-dev": {
"phpunit/phpunit": "4.3.*@dev"
},
"time": "2019-09-10T13:16:29+00:00",
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "0.5.x-dev"
}
},
"installation-source": "dist",
"autoload": {
"files": [
"Spyc.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "mustangostang",
"email": "[email protected]"
}
],
"description": "A simple YAML loader/dumper class for PHP",
"homepage": "https://github.com/mustangostang/spyc/",
"keywords": [
"spyc",
"yaml",
"yml"
]
"description": "Better Font Awesome Library for WordPress"
},
{
"name": "myclabs/deep-copy",
Expand Down
10 changes: 5 additions & 5 deletions vendor/mickey-kay/better-font-awesome-library/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,19 +133,19 @@ If either the `$args['load_shortcode']` or `$args['load_tinymce_plugin']` initia
[icon name="star" class="2x spin" unprefixed_class="my-custom-class"]
```

**name**
#### name
The unprefixed icon name (e.g. star). The version-specific prefix will be automatically prepended.

**class**
#### class
Unprefixed [Font Awesome icon classes](http://fortawesome.github.io/Font-Awesome/examples/). The version-specific prefix will be automatically prepended to each class.

**unprefixed_class**
#### unprefixed_class
Any additional classes that you wish to remain unprefixed (e.g. my-custom-class).

**style**
#### style
The specific icon style (e.g. `brand` vs. `solid`) to use.

#### Shortcode Output ####
### Shortcode Output
The following shortcode:
```
[icon name="moon" style="solid" class="2x spin" unprefixed_class="my-custom-class"]
Expand Down
34 changes: 0 additions & 34 deletions vendor/mickey-kay/better-font-awesome-library/better-font-awesome-library.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,6 @@
* is still an issue?
*/

/**
* 2.0.0 changes
*
* - [x] Switch to only using 1. FA@latest, or 2. 4@latest vs 5@latest (need to pin at 4 for any reason?)
* - [x] Switch to using FA GraphQL API for #allthethings
* - [x] Version data
* - [x] Icons list
* - [x] Include v4 shim css if needed, add admin option
* - [x] Display current version in the admin.
* - [x] Remove inc/icon-updater logic if possible
* - [x] Corroborate what shim actually does
* - [x] Add note on transient expiration
* - [ ] Check what happens if transient expires but fetch fails
*/

// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;

Expand Down Expand Up @@ -391,7 +376,6 @@ private function get_fallback_release_data() {
/**
* Filter the fallback release data path.
*
* @todo add to docs
* @since 2.0.0
*
* @param string $fallback_release_data_path The path to the fallback Font Awesome directory.
Expand Down Expand Up @@ -421,7 +405,6 @@ private function get_font_awesome_release_data() {
$release_data = array();

// 2. Short-circuit return the transient value if set.
// @todo this probably shouldn't be a false check :thinking:
if ( false !== $transient_value ) {
$release_data = $transient_value ;
}
Expand Down Expand Up @@ -487,7 +470,6 @@ private function get_font_awesome_release_data() {
/**
* Filter release data transient expiration.
*
* @todo Renamed old filter, which was incorrectly named. Call out in readme.
* @since 2.0.0
*
* @param int Expiration for release data.
Expand Down Expand Up @@ -548,7 +530,6 @@ private function get_formatted_icon_array() {
'slug' => $icon_metadata['id'],
'style' => $icon_style,
'base_class' => $this->get_icon_base_class( $icon_metadata['id'], $icon_style ),
// @todo this is not included in the GraphQL API :(
'searchTerms' => $icon_metadata['id'],
];
}
Expand Down Expand Up @@ -681,19 +662,6 @@ public function render_shortcode( $atts ) {
'style' => '', /* Style category */
), $atts ));

// @todo remove and verify this logic isn't needed with v4 shim CSS included
// $icon = $this->get_icon_by_slug( $name );

// // Maybe this is an old icon that needs an updated alias.
// if ( ! $icon ) {
// require __DIR__ . '/inc/icon-updater.php';
// $name = bfa_get_updated_icon_slug( $name );

// if ( ! $name ) {
// return '';
// }
// }

$prefix = $this->get_prefix();
$classes = [];

Expand Down Expand Up @@ -979,8 +947,6 @@ public function get_version() {
return $this->get_font_awesome_release_data()['version'];
}

// @todo Remove the functions below that aren't used.

/**
* Get the main font awesome stylesheet URL.
*
Expand Down

0 comments on commit 7599583

Please sign in to comment.